Synchronise presets with recent subme/brdo/bidir_refine -> subme changes in

libx264

Originally committed as revision 15572 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-fastfirstpass.ffpreset
index c0d6cbc93c7d25a39892e437fadb59c6901d354b..f2ce57b178593532bd6bacb70d71b2880739dc84 100644 (file)
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-fastfirstpass.ffpreset
@@ -16,6 +16,5 @@ qmax=51
 qdiff=4
 refs=1
 directpred=1
-bidir_refine=0
 trellis=0
-flags2=-bpyramid-wpred-brdo-mixed_refs-dct8x8+fastpskip
+flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip

diff --git a/ffpresets/libx264-hq.ffpreset b/ffpresets/libx264-hq.ffpreset
index b20cf4d1c1008afa3ccd11231a1987d7944eae6c..3f6cda6b0dfc78e77cb7bb51f56eedbf0acbf5d2 100644 (file)
--- a/ffpresets/libx264-hq.ffpreset
+++ b/ffpresets/libx264-hq.ffpreset
@@ -3,7 +3,7 @@ flags=+loop
 cmp=+chroma
 partitions=+parti8x8+parti4x4+partp8x8+partb8x8
 me_method=umh
-subq=7
+subq=8
 me_range=16
 g=250
 keyint_min=25
@@ -17,6 +17,5 @@ qdiff=4
 bf=16
 refs=4
 directpred=3
-bidir_refine=1
 trellis=1
-flags2=+bpyramid+wpred+brdo+mixed_refs+dct8x8+fastpskip
+flags2=+bpyramid+wpred+mixed_refs+dct8x8+fastpskip

diff --git a/ffpresets/libx264-max.ffpreset b/ffpresets/libx264-max.ffpreset
index 2f1d025242e5fca9a30aff0afec355a69e0745f7..3638480a882bc7b69de2abc59659a3919462ae5d 100644 (file)
--- a/ffpresets/libx264-max.ffpreset
+++ b/ffpresets/libx264-max.ffpreset
@@ -3,7 +3,7 @@ flags=+loop
 cmp=+chroma
 partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8
 me_method=tesa
-subq=7
+subq=9
 me_range=32
 g=250
 keyint_min=25
@@ -17,6 +17,5 @@ qdiff=4
 bf=16
 refs=16
 directpred=3
-bidir_refine=1
 trellis=2
-flags2=+bpyramid+wpred+brdo+mixed_refs+dct8x8-fastpskip
+flags2=+bpyramid+wpred+mixed_refs+dct8x8-fastpskip

diff --git a/ffpresets/libx264-normal.ffpreset b/ffpresets/libx264-normal.ffpreset
index e7d6db9ada18a6fb7e7a5feaa6744bac81272ea3..180b9d2493f171b6e201800165576ac980ac2901 100644 (file)
--- a/ffpresets/libx264-normal.ffpreset
+++ b/ffpresets/libx264-normal.ffpreset
@@ -17,6 +17,5 @@ qdiff=4
 bf=16
 refs=2
 directpred=3
-bidir_refine=1
 trellis=0
 flags2=+bpyramid+wpred+dct8x8+fastpskip