From 69bf69c77eb801d50dcbf8031c3c0f3feadb2a4c Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@gmail.com>
Date: Mon, 6 Oct 2008 10:13:52 +0000
Subject: [PATCH] Synchronise presets with recent subme/brdo/bidir_refine ->
 subme changes in libx264

Originally committed as revision 15572 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 ffpresets/libx264-fastfirstpass.ffpreset | 3 +--
 ffpresets/libx264-hq.ffpreset            | 5 ++---
 ffpresets/libx264-max.ffpreset           | 5 ++---
 ffpresets/libx264-normal.ffpreset        | 1 -
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-fastfirstpass.ffpreset
index c0d6cbc93c..f2ce57b178 100644
--- 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 b20cf4d1c1..3f6cda6b0d 100644
--- 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 2f1d025242..3638480a88 100644
--- 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 e7d6db9ada..180b9d2493 100644
--- 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