* 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>
* qatar/master:
sunrast: Check for out of bounds reads
lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER
lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
Add libvpx presets.
doc/avtools: add forgotten part to stream specifiers description
swscale: prevent overflow during initialization
g722: Add a fate test for the encoder
fate: Add a target for creating a 16000 Hz mono synthetic audio file
macosx: use the default surface on newer sdl
Conflicts:
ffplay.c
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
It is simpler and more consistent to use "-preset $speed -qp 0" for
lossless. Also, the old presets encode slower.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* qatar/master:
Fix compilation of iirfilter-test.
libx264: handle closed GOP codec flag
lavf: remove duplicate assignment in avformat_alloc_context.
lavf: use designated initializers for AVClasses.
flvdec: clenup debug code
asfdec: fix possible overread on broken files.
asfdec: do not fall back to binary/generic search
asfdec: reindent after previous commit c7bd5ed
asfdec: fallback to binary search internally
mpegaudio: add _fixed suffix to some names
Modify x86util.asm to ease transitioning to 10-bit H.264 assembly.
dct: build dct32 as separate object files
qdm2: include correct header for rdft
Conflicts:
ffpresets/libx264-fast.ffpreset
ffpresets/libx264-fast_firstpass.ffpreset
ffpresets/libx264-faster.ffpreset
ffpresets/libx264-faster_firstpass.ffpreset
ffpresets/libx264-medium.ffpreset
ffpresets/libx264-medium_firstpass.ffpreset
ffpresets/libx264-placebo.ffpreset
ffpresets/libx264-placebo_firstpass.ffpreset
ffpresets/libx264-slow.ffpreset
ffpresets/libx264-slow_firstpass.ffpreset
ffpresets/libx264-slower.ffpreset
ffpresets/libx264-slower_firstpass.ffpreset
ffpresets/libx264-superfast.ffpreset
ffpresets/libx264-superfast_firstpass.ffpreset
ffpresets/libx264-ultrafast.ffpreset
ffpresets/libx264-ultrafast_firstpass.ffpreset
ffpresets/libx264-veryfast.ffpreset
ffpresets/libx264-veryfast_firstpass.ffpreset
ffpresets/libx264-veryslow.ffpreset
ffpresets/libx264-veryslow_firstpass.ffpreset
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Also update libx264 presets to keep closed gop as default.
Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Also allow qmin/qmax to go up to 69 (the current max value for libx264). This
will have to increase when we add 9/10-bit support.
(cherry picked from commit c7ac200d15)
Since we now have the official x264 presets in ffmpeg, there's no reason to
keep around the old ones.
Patch by Lou Logan <lou AT fakeoutdoorsman DOT com>.
Originally committed as revision 25142 to svn://svn.ffmpeg.org/ffmpeg/trunk
Not 100% accurate, since not all x264 options have ffmpeg equivalents yet.
Patch by Lou Logan.
Originally committed as revision 22144 to svn://svn.ffmpeg.org/ffmpeg/trunk
originally as I thought x264 set these automatically when specifying a level.
Originally committed as revision 16629 to svn://svn.ffmpeg.org/ffmpeg/trunk
whether they have to be specified in the first pass as well. Also use
b_strategy=2 in hq and max presets to further improve compression efficiency.
Originally committed as revision 16476 to svn://svn.ffmpeg.org/ffmpeg/trunk
use this mode and it has to be enabled in the first pass to be used in the
second
Originally committed as revision 16474 to svn://svn.ffmpeg.org/ffmpeg/trunk
in ffpreset files.
Patch by Francesco Cosoleto cosoleto -- gmail --dot-- com
Originally committed as revision 15447 to svn://svn.ffmpeg.org/ffmpeg/trunk
* default - x264 CLI default values
* fastfirstpass - disables options unnecessary for first pass
* normal - Dark Shikari’s Q55 preset
* hq - Dark Shikari’s Q75 preset
* max - all options maxed out (at time of writing)
Originally committed as revision 15348 to svn://svn.ffmpeg.org/ffmpeg/trunk
Michael Niedermayer
Janne Grunau
Anton Khirnov
Lou Logan
Jindrich Makovicka
Baptiste Coudurier
Jason Garrett-Glaser
Janne Grunau
Lou Logan
Erik Slagter
Jason Garrett-Glaser
Robert Swain
Francesco Cosoleto