summaryrefslogtreecommitdiff
path: root/presets
Commit message (Collapse)AuthorAgeFilesLines
* presets: remove moldering iPod presetsLou Logan2014-06-172-12/+0
| | | | | | | | | | | | | | * Some users are trying to use them for non-ancient iDevices when baseline profile and level 1.3/3.0 would not be required. * "640" and "320" no longer make sense. * Some recommended options can be viewed at: <https://trac.ffmpeg.org/wiki/Encode/H.264#iOS> Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* presets: specify the codecs.Clément Bœsch2012-05-047-0/+14
| | | | | | | | This allows the following usages: FFMPEG_DATADIR=presets ./ffmpeg -f lavfi -i testsrc=d=5 -vcodec libx264 -vpre ipod640 -f null - FFMPEG_DATADIR=presets ./ffmpeg -f lavfi -i testsrc=d=5 -vpre libx264-ipod640 -f null - The second example was broken even if documented.
* Remove redundant libx264 preset filesLou Logan2011-10-2228-44/+0
| | | | | | | These are available via -preset or -vprofile and the addition of -qp 0 or -crf 0 if lossless is desired. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* presets: spelling error in libvpx 1080p50_60Lou Logan2011-10-211-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* presets: favor vprofile over profile to avoid conflicts with audio profilesMichael Niedermayer2011-10-209-9/+9
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-2035-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* presets: rename presets directoryJanne Grunau2011-10-1935-0/+136