RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
30,687 Commits 37 Branches 400 Tags 270 MiB
Commit Graph

27 Commits

Author SHA1 Message Date
Michael Niedermayer b4bcd1e2f1 Merge remote-tracking branch 'qatar/master' 
* 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>
 2011-05-18 05:42:42 +02:00
Jindrich Makovicka e25c67108a libx264: handle closed GOP codec flag 
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>
 2011-05-17 23:01:42 +02:00
Baptiste Coudurier 14360e0783 Remove now useless ffpresets for x264, use -preset 2011-04-16 16:59:39 -07:00
Jason Garrett-Glaser a97b9325cb Update qmin/qmax values for libx264 presets 
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)
 2011-02-09 03:33:56 +01:00
Jason Garrett-Glaser c7ac200d15 Update qmin/qmax values for libx264 presets 
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.
 2011-02-08 15:59:30 -08:00
Janne Grunau 2c3589bfda consolidate .gitignore patters into a single file 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-18 21:32:05 +01:00
Janne Grunau 348b8218f7 convert svn:ignore properties to .gitignore files 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-17 15:50:14 +01:00
Lou Logan 61410787b8 Remove legacy x264 presets 
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
 2010-09-17 20:14:24 +00:00
Lou Logan 38c07dcc3e Update x264 presets. Patch by Lou Logan <lou@fakeoutdoorsman.com> 
Originally committed as revision 23879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-29 03:17:11 +00:00
Lou Logan 7ef7ae930c Update x264 presets in line with latest x264 changes. 
Patch by Lou Logan.

Originally committed as revision 22714 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-29 01:34:33 +00:00
Lou Logan 94052341be Use the newly available x264 parameters in ffmpeg in the x264 preset files. 
Patch by Lou Logan.

Originally committed as revision 22695 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-26 22:40:55 +00:00
Baptiste Coudurier dac99c359e Enable mbtree by default, and remove it from presets 
Originally committed as revision 22671 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 19:39:06 +00:00
Lou Logan d41f1fa644 Add presets for all of the x264 presets, including fastfirstpass versions. 
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
 2010-03-02 03:19:12 +00:00
Erik Slagter 25a42948c6 Add MBtree support for libx264 
Patch by Erik Slagter

Originally committed as revision 20774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 20:01:46 +00:00
Jason Garrett-Glaser 096c87f667 Add weightp support in API for libx264. 
ffmpeg can encode baseline profile again.

Originally committed as revision 20600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-24 15:49:34 +00:00
Jason Garrett-Glaser 03354862cb Update preset files to jive somewhat better with more recent x264 API. 
Originally committed as revision 19837 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-14 09:59:32 +00:00
Robert Swain c79de5c07b The default subq value in the x264 CLI is now 6, not 5. 
Originally committed as revision 16788 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 21:28:56 +00:00
Robert Swain 76bd1cd8e1 Add maxrate and bufsize specifications for iPod presets. I omitted these 
originally as I thought x264 set these automatically when specifying a level.

Originally committed as revision 16629 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 02:20:24 +00:00
Robert Swain 27ab726e1a Add presets for Apple iPod constraints 
Originally committed as revision 16585 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 19:46:42 +00:00
Robert Swain a6c2a5ef6c Add presets to use as constraints for H.264 Baseline and Main profiles 
Originally committed as revision 16584 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 19:40:35 +00:00
Robert Swain 4b82e3cedc Add some lossless h.264 encoding presets as suggested by Jason 
Originally committed as revision 16478 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 17:38:29 +00:00
Robert Swain 986a5e91f5 Add a slow first pass preset 
Originally committed as revision 16477 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 16:52:15 +00:00
Robert Swain ef4140690b Be consistent and use b-frames throughout the presets to avoid confusion about 
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
 2009-01-07 16:51:55 +00:00
Robert Swain 199a8aa9f4 Change direct prediction for fast first pass to automatic as all other presets 
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
 2009-01-07 15:44:41 +00:00
Robert Swain 69bf69c77e Synchronise presets with recent subme/brdo/bidir_refine -> subme changes in 
libx264

Originally committed as revision 15572 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-06 10:13:52 +00:00
Francesco Cosoleto b235dbb05b Substitute the not anymore supported "me" option name with "me_method" 
in ffpreset files.
Patch by Francesco Cosoleto cosoleto -- gmail --dot-- com

Originally committed as revision 15447 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-28 19:06:46 +00:00
Robert Swain 4ee735fc54 libx264 ffpresets: 
* 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
 2008-09-17 19:31:39 +00:00