Michael Niedermayer
d0492578c8
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
presets: rename presets directory
lavc: make avcodec_get_context_defaults3 "officially" public
lavf: replace av_new_stream->avformat_new_stream part II.
lavf,lavd: replace av_new_stream->avformat_new_stream part I.
lavf: add avformat_new_stream as a replacement for av_new_stream.
Use correct scaling table for bwd-pred MVs in second B-field
Ut Video decoder
Makefile: change presets extension to .avpreset
lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
lavfi: add testsrc source
AVOptions: add documentation.
presets: update libx264 ffpresets
Conflicts:
Changelog
doc/APIchanges
doc/ffmpeg.texi
ffpresets/libx264-ipod320.ffpreset
ffpresets/libx264-ipod640.ffpreset
ffserver.c
libavcodec/avcodec.h
libavcodec/options.c
libavcodec/version.h
libavdevice/libdc1394.c
libavfilter/avfilter.h
libavfilter/vsrc_testsrc.c
libavformat/flvdec.c
libavformat/riff.c
libavformat/version.h
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-09-26 00:24:01 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-17 03:38:47 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-14 22:24:00 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-01 03:48:33 +02:00
2011-10-18 01:54:40 +02:00
2011-10-20 02:34:51 +02:00
2011-09-08 22:37:31 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-16 02:38:02 +02:00
2011-10-16 02:43:36 +02:00
2011-10-20 02:34:51 +02:00
2011-10-16 21:51:28 +02:00
2011-08-01 00:58:49 +02:00
2011-10-20 02:34:51 +02:00
2011-08-22 09:35:58 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-12 16:51:16 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-08-26 20:53:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-08-09 19:56:25 +02:00
2011-10-20 02:34:51 +02:00
2011-09-07 07:27:55 +02:00
2011-10-20 02:34:51 +02:00
2011-10-07 22:28:07 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-09-07 02:36:42 +02:00
2011-10-20 02:34:51 +02:00
2011-10-13 06:00:03 +02:00
2011-07-17 20:12:02 +02:00
2011-10-13 16:50:20 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-09-28 18:13:52 +02:00
2011-10-13 06:00:03 +02:00
2011-10-14 03:48:22 +02:00
2011-10-14 03:48:22 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-24 22:39:52 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-17 22:36:43 +02:00
2011-07-14 02:24:10 +02:00
2011-10-20 02:34:51 +02:00
2011-10-09 22:58:31 +02:00
2011-08-26 01:29:40 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-13 06:00:03 +02:00
2011-10-17 07:33:10 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-08-20 00:27:38 +02:00
2011-10-20 02:34:51 +02:00
2011-10-17 03:38:47 +02:00
2011-10-20 02:34:51 +02:00
2011-09-28 02:07:44 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-19 11:20:48 +02:00
2011-10-20 02:34:51 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-18 01:54:40 +02:00
2011-10-20 02:34:51 +02:00
2011-10-19 23:04:31 +02:00
2011-08-09 19:56:25 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-27 22:27:52 +02:00
2011-10-20 02:34:51 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-09-05 03:10:45 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-26 13:51:29 +02:00
2011-10-17 07:33:10 +02:00
2011-10-05 04:07:59 +02:00
2011-10-20 02:34:51 +02:00
2011-10-18 01:54:40 +02:00
2011-10-13 06:00:03 +02:00
2011-09-24 22:39:52 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-17 22:36:43 +02:00
2011-10-13 16:50:20 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-07-14 20:44:58 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-23 00:35:31 +02:00
2011-10-18 01:54:40 +02:00
2011-09-27 02:14:37 +02:00
2011-09-08 22:37:31 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-18 01:54:40 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-18 01:54:40 +02:00
2011-10-18 01:54:40 +02:00
2011-10-18 01:54:40 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-09-27 02:14:37 +02:00
2011-08-26 23:18:54 +02:00
2011-10-20 02:34:51 +02:00
2011-10-17 16:51:48 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-08-25 21:43:30 +02:00
2011-07-14 20:44:58 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-19 17:02:11 +02:00
2011-09-08 01:55:07 +02:00
2011-10-20 02:34:51 +02:00
2011-09-26 00:22:41 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
d0492578c8