summaryrefslogtreecommitdiff
path: root/ffpresets
diff options
context:
space:
mode:
authorLou Logan <lou@fakeoutdoorsman.com>2010-03-29 01:34:33 +0000
committerJason Garrett-Glaser <darkshikari@gmail.com>2010-03-29 01:34:33 +0000
commit7ef7ae930c1092a1fcade106f1bb7623ffbd2e5b (patch)
treefbb4120e83dfccb1bf0219f29d23c07375800a9e /ffpresets
parente69decaef4da0c644955ff2ea5d3a71fd7dd44f9 (diff)
downloadffmpeg-7ef7ae930c1092a1fcade106f1bb7623ffbd2e5b.tar.gz
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
Diffstat (limited to 'ffpresets')
-rw-r--r--ffpresets/libx264-faster.ffpreset3
-rw-r--r--ffpresets/libx264-faster_firstpass.ffpreset3
-rw-r--r--ffpresets/libx264-superfast.ffpreset22
-rw-r--r--ffpresets/libx264-superfast_firstpass.ffpreset22
-rw-r--r--ffpresets/libx264-veryfast.ffpreset6
-rw-r--r--ffpresets/libx264-veryfast_firstpass.ffpreset2
6 files changed, 52 insertions, 6 deletions
diff --git a/ffpresets/libx264-faster.ffpreset b/ffpresets/libx264-faster.ffpreset
index 57771f6f24..a32eed3cc5 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 969fcf9ab6..c777eb4e23 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-superfast.ffpreset b/ffpresets/libx264-superfast.ffpreset
new file mode 100644
index 0000000000..e2cb95931f
--- /dev/null
+++ b/ffpresets/libx264-superfast.ffpreset
@@ -0,0 +1,22 @@
+coder=1
+flags=+loop
+cmp=+chroma
+partitions=+parti8x8+parti4x4-partp8x8-partb8x8
+me_method=dia
+subq=1
+me_range=16
+g=250
+keyint_min=25
+sc_threshold=40
+i_qfactor=0.71
+b_strategy=1
+qcomp=0.6
+qmin=10
+qmax=51
+qdiff=4
+bf=3
+refs=1
+directpred=1
+trellis=0
+flags2=+bpyramid-mixed_refs+wpred+dct8x8+fastpskip-mbtree
+wpredp=0
diff --git a/ffpresets/libx264-superfast_firstpass.ffpreset b/ffpresets/libx264-superfast_firstpass.ffpreset
new file mode 100644
index 0000000000..5f44bea24c
--- /dev/null
+++ b/ffpresets/libx264-superfast_firstpass.ffpreset
@@ -0,0 +1,22 @@
+coder=1
+flags=+loop
+cmp=+chroma
+partitions=-parti8x8-parti4x4-partp8x8-partb8x8
+me_method=dia
+subq=1
+me_range=16
+g=250
+keyint_min=25
+sc_threshold=40
+i_qfactor=0.71
+b_strategy=1
+qcomp=0.6
+qmin=10
+qmax=51
+qdiff=4
+bf=3
+refs=1
+directpred=1
+trellis=0
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip-mbtree
+wpredp=0
diff --git a/ffpresets/libx264-veryfast.ffpreset b/ffpresets/libx264-veryfast.ffpreset
index e2cb95931f..a29b1154f8 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 5f44bea24c..bab5d9bfed 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