Add weightp support in API for libx264.

ffmpeg can encode baseline profile again.

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

14 files changed, 15 insertions, 1 deletions

diff --git a/ffpresets/libx264-baseline.ffpreset b/ffpresets/libx264-baseline.ffpreset
index 47664189b2..ee7654bdec 100644
--- a/ffpresets/libx264-baseline.ffpreset
+++ b/ffpresets/libx264-baseline.ffpreset
@@ -1,3 +1,4 @@
 coder=0
 bf=0
 flags2=-wpred-dct8x8
+wpredp=0
diff --git a/ffpresets/libx264-default.ffpreset b/ffpresets/libx264-default.ffpreset
index 1377530e78..75191e21b3 100644
--- a/ffpresets/libx264-default.ffpreset
+++ b/ffpresets/libx264-default.ffpreset
@@ -19,3 +19,4 @@ refs=3
 directpred=1
 trellis=1
 flags2=+mixed_refs+wpred+dct8x8+fastpskip
+wpredp=2
diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-fastfirstpass.ffpreset
index 20aecf1c83..7278f771e1 100644
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-fastfirstpass.ffpreset
@@ -3,7 +3,7 @@ flags=+loop
 cmp=+chroma
 partitions=-parti8x8-parti4x4-partp8x8-partp4x4-partb8x8
 me_method=dia
-subq=1
+subq=2
 me_range=16
 g=250
 keyint_min=25
@@ -19,3 +19,4 @@ refs=1
 directpred=3
 trellis=0
 flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip
+wpredp=2
diff --git a/ffpresets/libx264-hq.ffpreset b/ffpresets/libx264-hq.ffpreset
index 32b64f1799..9c14d8f554 100644
--- a/ffpresets/libx264-hq.ffpreset
+++ b/ffpresets/libx264-hq.ffpreset
@@ -19,3 +19,4 @@ refs=4
 directpred=3
 trellis=1
 flags2=+wpred+mixed_refs+dct8x8+fastpskip
+wpredp=2
diff --git a/ffpresets/libx264-ipod320.ffpreset b/ffpresets/libx264-ipod320.ffpreset
index 89441c7deb..943b521348 100644
--- a/ffpresets/libx264-ipod320.ffpreset
+++ b/ffpresets/libx264-ipod320.ffpreset
@@ -4,3 +4,4 @@ flags2=-wpred-dct8x8
 level=13
 maxrate=768000
 bufsize=3000000
+wpredp=0
diff --git a/ffpresets/libx264-ipod640.ffpreset b/ffpresets/libx264-ipod640.ffpreset
index fd58e2ad71..1ed3d9fb28 100644
--- a/ffpresets/libx264-ipod640.ffpreset
+++ b/ffpresets/libx264-ipod640.ffpreset
@@ -5,3 +5,4 @@ flags2=-wpred-dct8x8
 level=30
 maxrate=10000000
 bufsize=10000000
+wpredp=0
diff --git a/ffpresets/libx264-lossless_fast.ffpreset b/ffpresets/libx264-lossless_fast.ffpreset
index dcf418afda..ea08d3c00b 100644
--- a/ffpresets/libx264-lossless_fast.ffpreset
+++ b/ffpresets/libx264-lossless_fast.ffpreset
@@ -17,3 +17,4 @@ qdiff=4
 directpred=1
 flags2=+fastpskip
 cqp=0
+wpredp=0
diff --git a/ffpresets/libx264-lossless_max.ffpreset b/ffpresets/libx264-lossless_max.ffpreset
index b8506c227f..8c049c9c93 100644
--- a/ffpresets/libx264-lossless_max.ffpreset
+++ b/ffpresets/libx264-lossless_max.ffpreset
@@ -18,3 +18,4 @@ refs=16
 directpred=1
 flags2=+mixed_refs+dct8x8+fastpskip
 cqp=0
+wpredp=2
diff --git a/ffpresets/libx264-lossless_medium.ffpreset b/ffpresets/libx264-lossless_medium.ffpreset
index 99fb6b9d07..558be6c931 100644
--- a/ffpresets/libx264-lossless_medium.ffpreset
+++ b/ffpresets/libx264-lossless_medium.ffpreset
@@ -17,3 +17,4 @@ qdiff=4
 directpred=1
 flags2=+fastpskip
 cqp=0
+wpredp=2
diff --git a/ffpresets/libx264-lossless_slow.ffpreset b/ffpresets/libx264-lossless_slow.ffpreset
index 2ecb55b07e..ff641cf40f 100644
--- a/ffpresets/libx264-lossless_slow.ffpreset
+++ b/ffpresets/libx264-lossless_slow.ffpreset
@@ -18,3 +18,4 @@ refs=2
 directpred=1
 flags2=+dct8x8+fastpskip
 cqp=0
+wpredp=2
diff --git a/ffpresets/libx264-lossless_slower.ffpreset b/ffpresets/libx264-lossless_slower.ffpreset
index dd499c7afd..854f74b236 100644
--- a/ffpresets/libx264-lossless_slower.ffpreset
+++ b/ffpresets/libx264-lossless_slower.ffpreset
@@ -18,3 +18,4 @@ refs=4
 directpred=1
 flags2=+mixed_refs+dct8x8+fastpskip
 cqp=0
+wpredp=2
diff --git a/ffpresets/libx264-max.ffpreset b/ffpresets/libx264-max.ffpreset
index fe498bb297..667ba85fef 100644
--- a/ffpresets/libx264-max.ffpreset
+++ b/ffpresets/libx264-max.ffpreset
@@ -19,3 +19,4 @@ refs=16
 directpred=3
 trellis=2
 flags2=+wpred+mixed_refs+dct8x8-fastpskip
+wpredp=2
diff --git a/ffpresets/libx264-normal.ffpreset b/ffpresets/libx264-normal.ffpreset
index c0a6c8ec1e..ee790b6434 100644
--- a/ffpresets/libx264-normal.ffpreset
+++ b/ffpresets/libx264-normal.ffpreset
@@ -19,3 +19,4 @@ refs=2
 directpred=3
 trellis=0
 flags2=+wpred+dct8x8+fastpskip
+wpredp=2
diff --git a/ffpresets/libx264-slowfirstpass.ffpreset b/ffpresets/libx264-slowfirstpass.ffpreset
index 280c336dc9..fe073310de 100644
--- a/ffpresets/libx264-slowfirstpass.ffpreset
+++ b/ffpresets/libx264-slowfirstpass.ffpreset
@@ -19,3 +19,4 @@ refs=1
 directpred=3
 trellis=0
 flags2=+wpred+dct8x8+fastpskip
+wpredp=2