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
..
libvpx-360p.ffpreset	presets: forgotten libvpx presets	2011-06-21 17:52:16 +02:00
libvpx-720p50_60.ffpreset	presets: forgotten libvpx presets	2011-06-21 17:52:16 +02:00
libvpx-720p.ffpreset	presets: forgotten libvpx presets	2011-06-21 17:52:16 +02:00
libvpx-1080p50_60.ffpreset	presets: forgotten libvpx presets	2011-06-21 17:52:16 +02:00
libvpx-1080p.ffpreset	presets: forgotten libvpx presets	2011-06-21 17:52:16 +02:00