aboutsummaryrefslogtreecommitdiffstats
path: root/ffpresets
diff options
context:
space:
mode:
authorJason Garrett-Glaser <darkshikari@gmail.com>2009-09-14 09:59:32 +0000
committerJason Garrett-Glaser <darkshikari@gmail.com>2009-09-14 09:59:32 +0000
commit03354862cbadbbd0ee6871c7c8b0d233415fc957 (patch)
treefe8f7dc0b61ec47b92eaa3446265188e341b0138 /ffpresets
parent8bb7dda2f7e8cee4d3f7c755ec1d411cebe1327a (diff)
downloadffmpeg-03354862cbadbbd0ee6871c7c8b0d233415fc957.tar.gz
Update preset files to jive somewhat better with more recent x264 API.
Originally committed as revision 19837 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffpresets')
-rw-r--r--ffpresets/libx264-default.ffpreset7
-rw-r--r--ffpresets/libx264-fastfirstpass.ffpreset2
-rw-r--r--ffpresets/libx264-hq.ffpreset4
-rw-r--r--ffpresets/libx264-max.ffpreset8
-rw-r--r--ffpresets/libx264-normal.ffpreset4
-rw-r--r--ffpresets/libx264-slowfirstpass.ffpreset4
6 files changed, 16 insertions, 13 deletions
diff --git a/ffpresets/libx264-default.ffpreset b/ffpresets/libx264-default.ffpreset
index ec20174c20..1377530e78 100644
--- a/ffpresets/libx264-default.ffpreset
+++ b/ffpresets/libx264-default.ffpreset
@@ -3,7 +3,7 @@ flags=+loop
cmp=+chroma
partitions=+parti8x8+parti4x4+partp8x8+partb8x8
me_method=hex
-subq=6
+subq=7
me_range=16
g=250
keyint_min=25
@@ -14,5 +14,8 @@ qcomp=0.6
qmin=10
qmax=51
qdiff=4
+bf=3
+refs=3
directpred=1
-flags2=+fastpskip
+trellis=1
+flags2=+mixed_refs+wpred+dct8x8+fastpskip
diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-fastfirstpass.ffpreset
index aaad4615d0..20aecf1c83 100644
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-fastfirstpass.ffpreset
@@ -14,7 +14,7 @@ qcomp=0.6
qmin=10
qmax=51
qdiff=4
-bf=4
+bf=3
refs=1
directpred=3
trellis=0
diff --git a/ffpresets/libx264-hq.ffpreset b/ffpresets/libx264-hq.ffpreset
index cdf67eb067..32b64f1799 100644
--- a/ffpresets/libx264-hq.ffpreset
+++ b/ffpresets/libx264-hq.ffpreset
@@ -14,8 +14,8 @@ qcomp=0.6
qmin=10
qmax=51
qdiff=4
-bf=4
+bf=3
refs=4
directpred=3
trellis=1
-flags2=+bpyramid+wpred+mixed_refs+dct8x8+fastpskip
+flags2=+wpred+mixed_refs+dct8x8+fastpskip
diff --git a/ffpresets/libx264-max.ffpreset b/ffpresets/libx264-max.ffpreset
index afdde53469..fe498bb297 100644
--- a/ffpresets/libx264-max.ffpreset
+++ b/ffpresets/libx264-max.ffpreset
@@ -3,8 +3,8 @@ flags=+loop
cmp=+chroma
partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8
me_method=tesa
-subq=9
-me_range=32
+subq=10
+me_range=24
g=250
keyint_min=25
sc_threshold=40
@@ -14,8 +14,8 @@ qcomp=0.6
qmin=10
qmax=51
qdiff=4
-bf=4
+bf=3
refs=16
directpred=3
trellis=2
-flags2=+bpyramid+wpred+mixed_refs+dct8x8-fastpskip
+flags2=+wpred+mixed_refs+dct8x8-fastpskip
diff --git a/ffpresets/libx264-normal.ffpreset b/ffpresets/libx264-normal.ffpreset
index 99ac2e319a..c0a6c8ec1e 100644
--- a/ffpresets/libx264-normal.ffpreset
+++ b/ffpresets/libx264-normal.ffpreset
@@ -14,8 +14,8 @@ qcomp=0.6
qmin=10
qmax=51
qdiff=4
-bf=4
+bf=3
refs=2
directpred=3
trellis=0
-flags2=+bpyramid+wpred+dct8x8+fastpskip
+flags2=+wpred+dct8x8+fastpskip
diff --git a/ffpresets/libx264-slowfirstpass.ffpreset b/ffpresets/libx264-slowfirstpass.ffpreset
index 7358d446d2..280c336dc9 100644
--- a/ffpresets/libx264-slowfirstpass.ffpreset
+++ b/ffpresets/libx264-slowfirstpass.ffpreset
@@ -14,8 +14,8 @@ qcomp=0.6
qmin=10
qmax=51
qdiff=4
-bf=4
+bf=3
refs=1
directpred=3
trellis=0
-flags2=+bpyramid+wpred+dct8x8+fastpskip
+flags2=+wpred+dct8x8+fastpskip