ffmpeg/libavcodec
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-09-30 02:43:20 +02:00
2011-10-12 22:18:35 +02:00
2011-06-02 20:06:00 +01:00
2011-04-28 04:26:01 +02:00
2011-04-17 23:43:54 +02:00
2011-08-12 17:20:57 +02:00
2011-10-11 14:57:58 -04:00
2011-10-10 21:36:12 +02:00
2011-03-28 00:16:44 +02:00
2011-05-05 03:30:24 +02:00
2011-04-11 23:39:12 +02:00
2011-04-27 03:51:04 +02:00
2011-05-21 02:31:27 +02:00
2011-10-10 21:36:12 +02:00
2011-09-16 05:53:14 +02:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-04-26 22:06:13 +02:00
2011-09-02 05:21:25 +02:00
2011-09-02 05:21:25 +02:00
2011-10-10 21:36:13 +02:00
2011-04-27 03:51:04 +02:00
2011-10-10 02:58:18 +02:00
2011-09-24 21:11:01 +02:00
2011-09-25 21:16:55 +02:00
2011-04-25 00:20:03 +02:00
2011-04-25 00:20:03 +02:00
2011-08-30 05:41:44 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-05-11 05:47:02 +02:00
2011-08-15 00:39:55 +02:00
2011-04-27 03:51:04 +02:00
2011-09-24 06:01:45 +02:00
2011-10-07 02:29:31 +02:00
2011-05-24 01:31:53 +02:00
2011-09-28 18:43:49 +02:00
2011-07-21 18:10:58 +01:00
2011-09-08 05:34:17 +02:00
2011-09-15 13:23:04 -07:00
2011-09-26 02:28:21 +02:00
2011-09-11 04:07:08 +02:00
2011-05-11 05:47:02 +02:00
2011-10-07 17:15:45 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-21 13:48:10 +02:00
2011-05-08 01:33:40 +02:00
2011-10-07 02:29:31 +02:00
2011-10-07 16:25:31 +02:00
2011-10-09 03:22:57 +02:00
2011-04-03 16:40:12 +02:00
2011-09-17 21:55:11 +02:00
2011-09-17 21:55:11 +02:00
2011-03-28 00:16:44 +02:00
2011-10-10 21:36:13 +02:00
2011-10-12 18:20:18 -04:00
2011-09-15 13:23:04 -07:00
2011-10-09 03:22:49 +02:00
2011-09-07 12:16:15 +02:00
2011-09-11 12:54:47 +02:00
2011-10-06 23:33:09 +02:00
2011-05-13 04:40:40 +02:00
2011-09-10 22:10:00 +02:00
2011-10-07 00:27:03 +02:00
2011-04-27 03:51:04 +02:00
2011-04-20 04:48:23 +02:00
2011-10-09 03:22:57 +02:00