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-10-11 20:25:55 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-13 04:40:40 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-09-27 02:14:37 +02:00
2011-06-30 16:50:27 +01:00
2011-03-19 13:33:20 +00:00
2011-07-05 02:26:17 +02:00
2011-03-19 13:33:20 +00:00
2011-09-25 11:18:41 +02:00
2011-10-07 02:53:18 +02:00
2011-10-07 02:53:18 +02:00
2011-05-22 04:53:19 +02:00
2011-09-04 09:37:41 +02:00
2011-09-04 09:37:41 +02:00
2011-10-13 06:00:03 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-29 20:01:04 +02:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2011-09-27 02:14:37 +02:00
2011-09-27 02:14:37 +02:00
2011-03-19 13:33:20 +00:00
2011-10-10 03:50:58 +02:00
2011-03-19 13:33:20 +00:00
2011-09-21 21:25:43 +02:00
2011-09-21 21:25:43 +02:00
2011-06-18 05:10:38 +02:00
2011-07-09 02:06:40 +02:00
2011-05-30 03:11:54 +02:00
2011-04-22 10:21:21 +02:00
2011-10-09 02:04:54 +02:00
2011-04-19 19:03:44 +02:00
2011-08-26 23:18:54 +02:00
2011-08-30 10:03:13 +02:00
2011-07-04 00:45:21 +02:00
2011-07-02 03:24:32 +02:00
2011-07-04 00:45:21 +02:00
2011-07-04 00:45:21 +02:00
2011-06-28 13:14:46 +02:00
2011-06-28 13:14:46 +02:00
2011-06-09 04:47:19 +02:00
2011-10-12 05:40:57 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-18 05:10:38 +02:00
2011-06-08 05:25:28 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-04-22 03:54:30 +02:00
2011-07-12 01:42:32 +02:00
2011-03-19 13:33:20 +00:00
2011-05-09 04:50:56 +02:00
2011-10-13 06:00:03 +02:00
2011-06-24 03:07:04 +02:00
2011-07-03 03:14:10 +02:00
2011-08-26 23:18:54 +02:00
2011-06-29 05:23:12 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-10-11 22:03:19 +02:00
2011-09-28 18:13:52 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-07-23 17:01:28 +02:00
2011-07-14 20:44:58 +02:00
2011-06-29 23:49:03 +01:00
2011-06-29 23:49:03 +01:00
2011-10-09 02:04:54 +02:00
2011-06-06 11:34:45 +02:00
2011-10-08 23:19:14 +02:00
2011-07-18 16:43:46 +02:00
2011-06-30 21:19:16 +02:00
2011-06-30 04:32:24 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2011-06-25 22:06:30 +02:00
2011-06-08 05:25:28 +02:00
2011-07-05 02:26:17 +02:00
2011-03-19 13:33:20 +00:00
2011-05-11 13:43:30 +02:00
2011-05-11 13:43:30 +02:00
2011-07-15 17:51:09 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-08-20 14:20:25 +02:00
2011-03-19 13:33:20 +00:00