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

diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-fastfirstpass.ffpreset
index 8bb4cd8..aaad461 100644 (file)
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-fastfirstpass.ffpreset
@@ -14,6 +14,7 @@ qcomp=0.6
 qmin=10
 qmax=51
 qdiff=4
+bf=4
 refs=1
 directpred=3
 trellis=0

diff --git a/ffpresets/libx264-hq.ffpreset b/ffpresets/libx264-hq.ffpreset
index 3f6cda6..cdf67eb 100644 (file)
--- a/ffpresets/libx264-hq.ffpreset
+++ b/ffpresets/libx264-hq.ffpreset
@@ -9,12 +9,12 @@ g=250
 keyint_min=25
 sc_threshold=40
 i_qfactor=0.71
-b_strategy=1
+b_strategy=2
 qcomp=0.6
 qmin=10
 qmax=51
 qdiff=4
-bf=16
+bf=4
 refs=4
 directpred=3
 trellis=1

diff --git a/ffpresets/libx264-max.ffpreset b/ffpresets/libx264-max.ffpreset
index 3638480..afdde53 100644 (file)
--- a/ffpresets/libx264-max.ffpreset
+++ b/ffpresets/libx264-max.ffpreset
@@ -9,12 +9,12 @@ g=250
 keyint_min=25
 sc_threshold=40
 i_qfactor=0.71
-b_strategy=1
+b_strategy=2
 qcomp=0.6
 qmin=10
 qmax=51
 qdiff=4
-bf=16
+bf=4
 refs=16
 directpred=3
 trellis=2

diff --git a/ffpresets/libx264-normal.ffpreset b/ffpresets/libx264-normal.ffpreset
index 180b9d2..99ac2e3 100644 (file)
--- a/ffpresets/libx264-normal.ffpreset
+++ b/ffpresets/libx264-normal.ffpreset
@@ -14,7 +14,7 @@ qcomp=0.6
 qmin=10
 qmax=51
 qdiff=4
-bf=16
+bf=4
 refs=2
 directpred=3
 trellis=0