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