[SCM] libav/experimental: Update x264 presets in line with latest x264 changes.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7ef7ae930c1092a1fcade106f1bb7623ffbd2e5b
Author: Lou Logan <lou at fakeoutdoorsman.com>
Date:   Mon Mar 29 01:34:33 2010 +0000

    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

diff --git a/ffpresets/libx264-faster.ffpreset b/ffpresets/libx264-faster.ffpreset
index 57771f6..a32eed3 100644
--- a/ffpresets/libx264-faster.ffpreset
+++ b/ffpresets/libx264-faster.ffpreset
@@ -18,5 +18,6 @@ bf=3
 refs=2
 directpred=1
 trellis=1
-flags2=+bpyramid-mixed_refs+wpred+dct8x8+fastpskip-mbtree
+flags2=+bpyramid-mixed_refs+wpred+dct8x8+fastpskip
 wpredp=1
+rc_lookahead=20
diff --git a/ffpresets/libx264-faster_firstpass.ffpreset b/ffpresets/libx264-faster_firstpass.ffpreset
index 969fcf9..c777eb4 100644
--- a/ffpresets/libx264-faster_firstpass.ffpreset
+++ b/ffpresets/libx264-faster_firstpass.ffpreset
@@ -18,5 +18,6 @@ bf=3
 refs=1
 directpred=1
 trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip-mbtree
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
 wpredp=1
+rc_lookahead=20
diff --git a/ffpresets/libx264-veryfast.ffpreset b/ffpresets/libx264-superfast.ffpreset
similarity index 100%
copy from ffpresets/libx264-veryfast.ffpreset
copy to ffpresets/libx264-superfast.ffpreset
diff --git a/ffpresets/libx264-veryfast_firstpass.ffpreset b/ffpresets/libx264-superfast_firstpass.ffpreset
similarity index 100%
copy from ffpresets/libx264-veryfast_firstpass.ffpreset
copy to ffpresets/libx264-superfast_firstpass.ffpreset
diff --git a/ffpresets/libx264-veryfast.ffpreset b/ffpresets/libx264-veryfast.ffpreset
index e2cb959..a29b115 100644
--- a/ffpresets/libx264-veryfast.ffpreset
+++ b/ffpresets/libx264-veryfast.ffpreset
@@ -1,9 +1,9 @@
 coder=1
 flags=+loop
 cmp=+chroma
-partitions=+parti8x8+parti4x4-partp8x8-partb8x8
-me_method=dia
-subq=1
+partitions=+parti8x8+parti4x4+partp8x8+partb8x8
+me_method=hex
+subq=2
 me_range=16
 g=250
 keyint_min=25
diff --git a/ffpresets/libx264-veryfast_firstpass.ffpreset b/ffpresets/libx264-veryfast_firstpass.ffpreset
index 5f44bea..bab5d9b 100644
--- a/ffpresets/libx264-veryfast_firstpass.ffpreset
+++ b/ffpresets/libx264-veryfast_firstpass.ffpreset
@@ -3,7 +3,7 @@ flags=+loop
 cmp=+chroma
 partitions=-parti8x8-parti4x4-partp8x8-partb8x8
 me_method=dia
-subq=1
+subq=2
 me_range=16
 g=250
 keyint_min=25

-- 
Libav/FFmpeg packaging