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

diff --git a/ffpresets/libx264-fast.ffpreset b/ffpresets/libx264-fast.ffpreset
index b301153..cac6534 100644 (file)
--- a/ffpresets/libx264-fast.ffpreset
+++ b/ffpresets/libx264-fast.ffpreset
@@ -20,3 +20,4 @@ directpred=1
 trellis=1
 flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
 wpredp=2
+rc_lookahead=30

diff --git a/ffpresets/libx264-fast_firstpass.ffpreset b/ffpresets/libx264-fast_firstpass.ffpreset
index e415989..65ec011 100644 (file)
--- a/ffpresets/libx264-fast_firstpass.ffpreset
+++ b/ffpresets/libx264-fast_firstpass.ffpreset
@@ -20,3 +20,4 @@ directpred=1
 trellis=0
 flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
 wpredp=2
+rc_lookahead=30

diff --git a/ffpresets/libx264-placebo.ffpreset b/ffpresets/libx264-placebo.ffpreset
index cfb19fe..fae2222 100644 (file)
--- a/ffpresets/libx264-placebo.ffpreset
+++ b/ffpresets/libx264-placebo.ffpreset
@@ -20,3 +20,4 @@ directpred=3
 trellis=2
 flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip
 wpredp=2
+rc_lookahead=60

diff --git a/ffpresets/libx264-placebo_firstpass.ffpreset b/ffpresets/libx264-placebo_firstpass.ffpreset
index cfb19fe..fae2222 100644 (file)
--- a/ffpresets/libx264-placebo_firstpass.ffpreset
+++ b/ffpresets/libx264-placebo_firstpass.ffpreset
@@ -20,3 +20,4 @@ directpred=3
 trellis=2
 flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip
 wpredp=2
+rc_lookahead=60

diff --git a/ffpresets/libx264-slow.ffpreset b/ffpresets/libx264-slow.ffpreset
index 79cfe65..0f3f4d4 100644 (file)
--- a/ffpresets/libx264-slow.ffpreset
+++ b/ffpresets/libx264-slow.ffpreset
@@ -20,3 +20,4 @@ directpred=3
 trellis=1
 flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
 wpredp=2
+rc_lookahead=50

diff --git a/ffpresets/libx264-slow_firstpass.ffpreset b/ffpresets/libx264-slow_firstpass.ffpreset
index d164a2e..89e74e4 100644 (file)
--- a/ffpresets/libx264-slow_firstpass.ffpreset
+++ b/ffpresets/libx264-slow_firstpass.ffpreset
@@ -20,3 +20,4 @@ directpred=3
 trellis=0
 flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
 wpredp=2
+rc_lookahead=50

diff --git a/ffpresets/libx264-slower.ffpreset b/ffpresets/libx264-slower.ffpreset
index 1d5d5ac..f3a412c 100644 (file)
--- a/ffpresets/libx264-slower.ffpreset
+++ b/ffpresets/libx264-slower.ffpreset
@@ -20,3 +20,4 @@ directpred=3
 trellis=2
 flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
 wpredp=2
+rc_lookahead=60

diff --git a/ffpresets/libx264-slower_firstpass.ffpreset b/ffpresets/libx264-slower_firstpass.ffpreset
index d164a2e..aa1eb1e 100644 (file)
--- a/ffpresets/libx264-slower_firstpass.ffpreset
+++ b/ffpresets/libx264-slower_firstpass.ffpreset
@@ -20,3 +20,4 @@ directpred=3
 trellis=0
 flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
 wpredp=2
+rc_lookahead=60

diff --git a/ffpresets/libx264-ultrafast.ffpreset b/ffpresets/libx264-ultrafast.ffpreset
index 98ebfd6..70acb00 100644 (file)
--- a/ffpresets/libx264-ultrafast.ffpreset
+++ b/ffpresets/libx264-ultrafast.ffpreset
@@ -20,3 +20,4 @@ directpred=1
 trellis=0
 flags2=-bpyramid-mixed_refs-wpred-dct8x8+fastpskip-mbtree
 wpredp=0
+aq_mode=0

diff --git a/ffpresets/libx264-ultrafast_firstpass.ffpreset b/ffpresets/libx264-ultrafast_firstpass.ffpreset
index 98ebfd6..70acb00 100644 (file)
--- a/ffpresets/libx264-ultrafast_firstpass.ffpreset
+++ b/ffpresets/libx264-ultrafast_firstpass.ffpreset
@@ -20,3 +20,4 @@ directpred=1
 trellis=0
 flags2=-bpyramid-mixed_refs-wpred-dct8x8+fastpskip-mbtree
 wpredp=0
+aq_mode=0

diff --git a/ffpresets/libx264-veryslow.ffpreset b/ffpresets/libx264-veryslow.ffpreset
index 57e808d..a060625 100644 (file)
--- a/ffpresets/libx264-veryslow.ffpreset
+++ b/ffpresets/libx264-veryslow.ffpreset
@@ -20,3 +20,4 @@ directpred=3
 trellis=2
 flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
 wpredp=2
+rc_lookahead=60

diff --git a/ffpresets/libx264-veryslow_firstpass.ffpreset b/ffpresets/libx264-veryslow_firstpass.ffpreset
index e04062d..6e7079b 100644 (file)
--- a/ffpresets/libx264-veryslow_firstpass.ffpreset
+++ b/ffpresets/libx264-veryslow_firstpass.ffpreset
@@ -20,3 +20,4 @@ directpred=3
 trellis=0
 flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
 wpredp=2
+rc_lookahead=60