diff options
author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2009-11-24 15:49:34 +0000 |
---|---|---|
committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2009-11-24 15:49:34 +0000 |
commit | 096c87f667ab8cdfc4fd290c80421a80c842adca (patch) | |
tree | 020f28c639f7d2578e375e3a056580056935202f /ffpresets | |
parent | f3bdc3da15e3c794f226f915656049bd01fbb871 (diff) | |
download | ffmpeg-streaming-096c87f667ab8cdfc4fd290c80421a80c842adca.zip ffmpeg-streaming-096c87f667ab8cdfc4fd290c80421a80c842adca.tar.gz |
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
Diffstat (limited to 'ffpresets')
-rw-r--r-- | ffpresets/libx264-baseline.ffpreset | 1 | ||||
-rw-r--r-- | ffpresets/libx264-default.ffpreset | 1 | ||||
-rw-r--r-- | ffpresets/libx264-fastfirstpass.ffpreset | 3 | ||||
-rw-r--r-- | ffpresets/libx264-hq.ffpreset | 1 | ||||
-rw-r--r-- | ffpresets/libx264-ipod320.ffpreset | 1 | ||||
-rw-r--r-- | ffpresets/libx264-ipod640.ffpreset | 1 | ||||
-rw-r--r-- | ffpresets/libx264-lossless_fast.ffpreset | 1 | ||||
-rw-r--r-- | ffpresets/libx264-lossless_max.ffpreset | 1 | ||||
-rw-r--r-- | ffpresets/libx264-lossless_medium.ffpreset | 1 | ||||
-rw-r--r-- | ffpresets/libx264-lossless_slow.ffpreset | 1 | ||||
-rw-r--r-- | ffpresets/libx264-lossless_slower.ffpreset | 1 | ||||
-rw-r--r-- | ffpresets/libx264-max.ffpreset | 1 | ||||
-rw-r--r-- | ffpresets/libx264-normal.ffpreset | 1 | ||||
-rw-r--r-- | ffpresets/libx264-slowfirstpass.ffpreset | 1 |
14 files changed, 15 insertions, 1 deletions
diff --git a/ffpresets/libx264-baseline.ffpreset b/ffpresets/libx264-baseline.ffpreset index 4766418..ee7654b 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 1377530..75191e2 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 20aecf1..7278f77 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 32b64f1..9c14d8f 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 89441c7..943b521 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 fd58e2a..1ed3d9f 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 dcf418a..ea08d3c 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 b8506c2..8c049c9 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 99fb6b9..558be6c 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 2ecb55b..ff641cf 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 dd499c7..854f74b 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 fe498bb..667ba85 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 c0a6c8e..ee790b6 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 280c336..fe07331 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 |