summaryrefslogtreecommitdiffstats
path: root/ffpresets
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-207-101/+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-136/+0
| |
| * presets: update libx264 ffpresetsAnton Khirnov2011-10-1960-602/+52
| | | | | | | | | | Use the native libx264 options and rename all the preset to use the avpreset extension.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-195-0/+84
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Add libvpx presets.Anton Khirnov2011-10-185-0/+84
| | | | | | | | Based on a patch by James Zern jzern AT google DOT com
* | remove libx264 lossless presetsLou Logan2011-09-266-122/+0
| | | | | | | | | | | | | | 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>
* | presets: use private options in libx264-ipod ffpresetsLou Logan2011-09-222-4/+6
| | | | | | | | Change flags2 options to supported libx264 private options.
* | Remove libx264 baseline ffpresetLou Logan2011-07-281-4/+0
| | | | | | | | | | | | Made redundant by "-profile baseline". Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | presets: forgotten libvpx presetsMichael Niedermayer2011-06-215-0/+84
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-186-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * libx264: handle closed GOP codec flagJindrich Makovicka2011-05-1726-26/+26
| | | | | | | | | | | | | | 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>
| * Update qmin/qmax values for libx264 presetsJason Garrett-Glaser2011-02-0826-52/+52
| | | | | | | | | | 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.
* | Remove now useless ffpresets for x264, use -presetBaptiste Coudurier2011-04-1621-461/+0
| |
* | Update qmin/qmax values for libx264 presetsJason Garrett-Glaser2011-02-0926-52/+52
|/ | | | | | 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 c7ac200d15e3240972d269df768068f0e3bb9c2f)
* consolidate .gitignore patters into a single fileJanne Grunau2011-01-181-1/+0
| | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* convert svn:ignore properties to .gitignore filesJanne Grunau2011-01-171-0/+1
| | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* Remove legacy x264 presetsLou Logan2010-09-176-132/+0
| | | | | | | | | 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
* Update x264 presets. Patch by Lou Logan <lou@fakeoutdoorsman.com>Lou Logan2010-06-296-2/+8
| | | | Originally committed as revision 23879 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update x264 presets in line with latest x264 changes.Lou Logan2010-03-296-6/+52
| | | | | | Patch by Lou Logan. Originally committed as revision 22714 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use the newly available x264 parameters in ffmpeg in the x264 preset files.Lou Logan2010-03-2612-0/+12
| | | | | | Patch by Lou Logan. Originally committed as revision 22695 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Enable mbtree by default, and remove it from presetsBaptiste Coudurier2010-03-2528-28/+28
| | | | Originally committed as revision 22671 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add presets for all of the x264 presets, including fastfirstpass versions.Lou Logan2010-03-0218-0/+396
| | | | | | | | 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
* Add MBtree support for libx264Erik Slagter2009-12-0816-16/+16
| | | | | | Patch by Erik Slagter Originally committed as revision 20774 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add weightp support in API for libx264.Jason Garrett-Glaser2009-11-2414-1/+15
| | | | | | ffmpeg can encode baseline profile again. Originally committed as revision 20600 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update preset files to jive somewhat better with more recent x264 API.Jason Garrett-Glaser2009-09-146-13/+16
| | | | Originally committed as revision 19837 to svn://svn.ffmpeg.org/ffmpeg/trunk
* The default subq value in the x264 CLI is now 6, not 5.Robert Swain2009-01-251-1/+1
| | | | Originally committed as revision 16788 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add maxrate and bufsize specifications for iPod presets. I omitted theseRobert Swain2009-01-162-0/+4
| | | | | | originally as I thought x264 set these automatically when specifying a level. Originally committed as revision 16629 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add presets for Apple iPod constraintsRobert Swain2009-01-132-0/+9
| | | | Originally committed as revision 16585 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add presets to use as constraints for H.264 Baseline and Main profilesRobert Swain2009-01-132-0/+4
| | | | Originally committed as revision 16584 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add some lossless h.264 encoding presets as suggested by JasonRobert Swain2009-01-076-0/+117
| | | | Originally committed as revision 16478 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a slow first pass presetRobert Swain2009-01-071-0/+21
| | | | Originally committed as revision 16477 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Be consistent and use b-frames throughout the presets to avoid confusion aboutRobert Swain2009-01-074-5/+6
| | | | | | | 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
* Change direct prediction for fast first pass to automatic as all other presetsRobert Swain2009-01-071-1/+1
| | | | | | | 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
* Synchronise presets with recent subme/brdo/bidir_refine -> subme changes inRobert Swain2008-10-064-9/+5
| | | | | | libx264 Originally committed as revision 15572 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Substitute the not anymore supported "me" option name with "me_method"Francesco Cosoleto2008-09-285-5/+5
| | | | | | | in ffpreset files. Patch by Francesco Cosoleto cosoleto -- gmail --dot-- com Originally committed as revision 15447 to svn://svn.ffmpeg.org/ffmpeg/trunk
* libx264 ffpresets:Robert Swain2008-09-175-0/+105
* 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
OpenPOWER on IntegriCloud