Files
ffmpeg/libavformat
Michael Niedermayer f884ef00de Merge remote-tracking branch 'qatar/master'
* qatar/master: (31 commits)
  tiffenc: initialize forgotten avctx.
  avplay: free the active audio packet at exit.
  avplay: free rdft data used for spectrogram analysis.
  log.h: make AVClass a named struct
  fix ac3 encoder documentation
  vc1: more prettyprinting cosmetics
  vc1: prettyprint some tables
  vc1: K&R formatting cosmetics
  AVOptions: bump minor and add APIchanges entry.
  cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
  AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
  Remove all uses of deprecated AVOptions API.
  AVOptions: add av_opt_next, deprecate av_next_option.
  AVOptions: add functions for evaluating option strings.
  AVOptions: split get_number().
  AVOptions: add av_opt_get*, deprecate av_get*.
  AVOptions: add av_opt_set*().
  AVOptions: add new API for enumerating children.
  rv34: move inverse transform functions to DSP context
  flvenc: Write the right metadata entry count
  ...

Conflicts:
	avconv.c
	cmdutils.c
	doc/APIchanges
	ffplay.c
	ffprobe.c
	libavcodec/ac3dec.c
	libavcodec/h264.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mpeg12enc.c
	libavcodec/options.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavfilter/vf_drawtext.c
	libavformat/flvdec.c
	libavformat/mpegtsenc.c
	libavformat/options.c
	libavutil/avutil.h
	libavutil/opt.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-13 06:00:03 +02:00
..
2011-07-31 19:40:08 +02:00
2011-09-26 00:24:01 +02:00
2011-10-10 02:58:18 +02:00
2011-04-17 23:43:54 +02:00
2011-09-12 22:12:14 +02:00
2011-08-14 00:05:36 +02:00
2011-04-04 02:15:12 +02:00
2011-09-10 05:24:39 +02:00
2011-10-10 21:36:12 +02:00
2011-09-28 16:11:01 +02:00
2011-09-25 12:29:20 +02:00
2011-08-01 00:58:49 +02:00
2011-08-22 09:35:58 +02:00
2011-10-12 04:15:40 +02:00
2011-04-09 03:17:07 +02:00
2011-08-09 19:56:25 +02:00
2011-10-07 22:28:07 +02:00
2011-10-10 02:58:18 +02:00
2011-04-21 03:37:05 +02:00
2011-04-09 03:17:07 +02:00
2011-08-20 00:27:38 +02:00
2011-04-07 03:32:26 +02:00
2011-10-10 02:58:18 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-10-07 16:25:30 +02:00
2011-08-09 19:56:25 +02:00
2011-10-01 01:26:55 +02:00
2011-06-02 20:06:00 +01:00
2011-04-04 02:15:12 +02:00
2011-04-24 03:41:22 +02:00
2011-05-30 02:39:26 +02:00
2011-08-25 21:43:30 +02:00