diff options
author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-03-25 19:39:06 +0000 |
---|---|---|
committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-03-25 19:39:06 +0000 |
commit | dac99c359e185d0af3b4a574b083b6e84fcaa8fa (patch) | |
tree | 2becaf46a7c27041195b5f78f0867ef888d6ff74 /ffpresets | |
parent | f3b3b4895a280904315616ccb3001ce43baedd8f (diff) | |
download | ffmpeg-streaming-dac99c359e185d0af3b4a574b083b6e84fcaa8fa.zip ffmpeg-streaming-dac99c359e185d0af3b4a574b083b6e84fcaa8fa.tar.gz |
Enable mbtree by default, and remove it from presets
Originally committed as revision 22671 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffpresets')
28 files changed, 28 insertions, 28 deletions
diff --git a/ffpresets/libx264-baseline.ffpreset b/ffpresets/libx264-baseline.ffpreset index a23b746..ee7654b 100644 --- a/ffpresets/libx264-baseline.ffpreset +++ b/ffpresets/libx264-baseline.ffpreset @@ -1,4 +1,4 @@ coder=0 bf=0 -flags2=-wpred-dct8x8+mbtree +flags2=-wpred-dct8x8 wpredp=0 diff --git a/ffpresets/libx264-default.ffpreset b/ffpresets/libx264-default.ffpreset index a10c633..75191e2 100644 --- a/ffpresets/libx264-default.ffpreset +++ b/ffpresets/libx264-default.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=3 directpred=1 trellis=1 -flags2=+mixed_refs+wpred+dct8x8+fastpskip+mbtree +flags2=+mixed_refs+wpred+dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-fast.ffpreset b/ffpresets/libx264-fast.ffpreset index 8040724..b301153 100644 --- a/ffpresets/libx264-fast.ffpreset +++ b/ffpresets/libx264-fast.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=2 directpred=1 trellis=1 -flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree +flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-fast_firstpass.ffpreset b/ffpresets/libx264-fast_firstpass.ffpreset index f0fb083..e415989 100644 --- a/ffpresets/libx264-fast_firstpass.ffpreset +++ b/ffpresets/libx264-fast_firstpass.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=1 directpred=1 trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree +flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-fastfirstpass.ffpreset index 7cf6faa..7278f77 100644 --- a/ffpresets/libx264-fastfirstpass.ffpreset +++ b/ffpresets/libx264-fastfirstpass.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=1 directpred=3 trellis=0 -flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip+mbtree +flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-hq.ffpreset b/ffpresets/libx264-hq.ffpreset index eafc52e..9c14d8f 100644 --- a/ffpresets/libx264-hq.ffpreset +++ b/ffpresets/libx264-hq.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=4 directpred=3 trellis=1 -flags2=+wpred+mixed_refs+dct8x8+fastpskip+mbtree +flags2=+wpred+mixed_refs+dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-ipod320.ffpreset b/ffpresets/libx264-ipod320.ffpreset index b102050..943b521 100644 --- a/ffpresets/libx264-ipod320.ffpreset +++ b/ffpresets/libx264-ipod320.ffpreset @@ -1,6 +1,6 @@ coder=0 bf=0 -flags2=-wpred-dct8x8+mbtree +flags2=-wpred-dct8x8 level=13 maxrate=768000 bufsize=3000000 diff --git a/ffpresets/libx264-ipod640.ffpreset b/ffpresets/libx264-ipod640.ffpreset index aa731dc..1ed3d9f 100644 --- a/ffpresets/libx264-ipod640.ffpreset +++ b/ffpresets/libx264-ipod640.ffpreset @@ -1,7 +1,7 @@ coder=0 bf=0 refs=1 -flags2=-wpred-dct8x8+mbtree +flags2=-wpred-dct8x8 level=30 maxrate=10000000 bufsize=10000000 diff --git a/ffpresets/libx264-lossless_fast.ffpreset b/ffpresets/libx264-lossless_fast.ffpreset index 9bbabf5..ea08d3c 100644 --- a/ffpresets/libx264-lossless_fast.ffpreset +++ b/ffpresets/libx264-lossless_fast.ffpreset @@ -15,6 +15,6 @@ qmin=10 qmax=51 qdiff=4 directpred=1 -flags2=+fastpskip+mbtree +flags2=+fastpskip cqp=0 wpredp=0 diff --git a/ffpresets/libx264-lossless_max.ffpreset b/ffpresets/libx264-lossless_max.ffpreset index d4ba018..8c049c9 100644 --- a/ffpresets/libx264-lossless_max.ffpreset +++ b/ffpresets/libx264-lossless_max.ffpreset @@ -16,6 +16,6 @@ qmax=51 qdiff=4 refs=16 directpred=1 -flags2=+mixed_refs+dct8x8+fastpskip+mbtree +flags2=+mixed_refs+dct8x8+fastpskip cqp=0 wpredp=2 diff --git a/ffpresets/libx264-lossless_medium.ffpreset b/ffpresets/libx264-lossless_medium.ffpreset index c4133c2..558be6c 100644 --- a/ffpresets/libx264-lossless_medium.ffpreset +++ b/ffpresets/libx264-lossless_medium.ffpreset @@ -15,6 +15,6 @@ qmin=10 qmax=51 qdiff=4 directpred=1 -flags2=+fastpskip+mbtree +flags2=+fastpskip cqp=0 wpredp=2 diff --git a/ffpresets/libx264-lossless_slow.ffpreset b/ffpresets/libx264-lossless_slow.ffpreset index 1421b95..ff641cf 100644 --- a/ffpresets/libx264-lossless_slow.ffpreset +++ b/ffpresets/libx264-lossless_slow.ffpreset @@ -16,6 +16,6 @@ qmax=51 qdiff=4 refs=2 directpred=1 -flags2=+dct8x8+fastpskip+mbtree +flags2=+dct8x8+fastpskip cqp=0 wpredp=2 diff --git a/ffpresets/libx264-lossless_slower.ffpreset b/ffpresets/libx264-lossless_slower.ffpreset index 9424459..854f74b 100644 --- a/ffpresets/libx264-lossless_slower.ffpreset +++ b/ffpresets/libx264-lossless_slower.ffpreset @@ -16,6 +16,6 @@ qmax=51 qdiff=4 refs=4 directpred=1 -flags2=+mixed_refs+dct8x8+fastpskip+mbtree +flags2=+mixed_refs+dct8x8+fastpskip cqp=0 wpredp=2 diff --git a/ffpresets/libx264-lossless_ultrafast.ffpreset b/ffpresets/libx264-lossless_ultrafast.ffpreset index 3c44488..1c429f2 100644 --- a/ffpresets/libx264-lossless_ultrafast.ffpreset +++ b/ffpresets/libx264-lossless_ultrafast.ffpreset @@ -15,5 +15,5 @@ qmin=10 qmax=51 qdiff=4 directpred=1 -flags2=+fastpskip+mbtree +flags2=+fastpskip cqp=0 diff --git a/ffpresets/libx264-main.ffpreset b/ffpresets/libx264-main.ffpreset index 0868c53..d1dc7dd 100644 --- a/ffpresets/libx264-main.ffpreset +++ b/ffpresets/libx264-main.ffpreset @@ -1 +1 @@ -flags2=-dct8x8+mbtree +flags2=-dct8x8 diff --git a/ffpresets/libx264-max.ffpreset b/ffpresets/libx264-max.ffpreset index 4289ab5..667ba85 100644 --- a/ffpresets/libx264-max.ffpreset +++ b/ffpresets/libx264-max.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=16 directpred=3 trellis=2 -flags2=+wpred+mixed_refs+dct8x8-fastpskip+mbtree +flags2=+wpred+mixed_refs+dct8x8-fastpskip wpredp=2 diff --git a/ffpresets/libx264-medium.ffpreset b/ffpresets/libx264-medium.ffpreset index 245f4d2..039f1d6 100644 --- a/ffpresets/libx264-medium.ffpreset +++ b/ffpresets/libx264-medium.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=3 directpred=1 trellis=1 -flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree +flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-medium_firstpass.ffpreset b/ffpresets/libx264-medium_firstpass.ffpreset index f0fb083..e415989 100644 --- a/ffpresets/libx264-medium_firstpass.ffpreset +++ b/ffpresets/libx264-medium_firstpass.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=1 directpred=1 trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree +flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-normal.ffpreset b/ffpresets/libx264-normal.ffpreset index dd7991b..ee790b6 100644 --- a/ffpresets/libx264-normal.ffpreset +++ b/ffpresets/libx264-normal.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=2 directpred=3 trellis=0 -flags2=+wpred+dct8x8+fastpskip+mbtree +flags2=+wpred+dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-placebo.ffpreset b/ffpresets/libx264-placebo.ffpreset index 447f3d8..cfb19fe 100644 --- a/ffpresets/libx264-placebo.ffpreset +++ b/ffpresets/libx264-placebo.ffpreset @@ -18,5 +18,5 @@ bf=16 refs=16 directpred=3 trellis=2 -flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip+mbtree +flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip wpredp=2 diff --git a/ffpresets/libx264-placebo_firstpass.ffpreset b/ffpresets/libx264-placebo_firstpass.ffpreset index 447f3d8..cfb19fe 100644 --- a/ffpresets/libx264-placebo_firstpass.ffpreset +++ b/ffpresets/libx264-placebo_firstpass.ffpreset @@ -18,5 +18,5 @@ bf=16 refs=16 directpred=3 trellis=2 -flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip+mbtree +flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip wpredp=2 diff --git a/ffpresets/libx264-slow.ffpreset b/ffpresets/libx264-slow.ffpreset index 955495a..79cfe65 100644 --- a/ffpresets/libx264-slow.ffpreset +++ b/ffpresets/libx264-slow.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=5 directpred=3 trellis=1 -flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree +flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-slow_firstpass.ffpreset b/ffpresets/libx264-slow_firstpass.ffpreset index e043a66..d164a2e 100644 --- a/ffpresets/libx264-slow_firstpass.ffpreset +++ b/ffpresets/libx264-slow_firstpass.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=1 directpred=3 trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree +flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-slower.ffpreset b/ffpresets/libx264-slower.ffpreset index 4c487cc..1d5d5ac 100644 --- a/ffpresets/libx264-slower.ffpreset +++ b/ffpresets/libx264-slower.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=8 directpred=3 trellis=2 -flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree +flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-slower_firstpass.ffpreset b/ffpresets/libx264-slower_firstpass.ffpreset index e043a66..d164a2e 100644 --- a/ffpresets/libx264-slower_firstpass.ffpreset +++ b/ffpresets/libx264-slower_firstpass.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=1 directpred=3 trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree +flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-slowfirstpass.ffpreset b/ffpresets/libx264-slowfirstpass.ffpreset index ba49065..fe07331 100644 --- a/ffpresets/libx264-slowfirstpass.ffpreset +++ b/ffpresets/libx264-slowfirstpass.ffpreset @@ -18,5 +18,5 @@ bf=3 refs=1 directpred=3 trellis=0 -flags2=+wpred+dct8x8+fastpskip+mbtree +flags2=+wpred+dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-veryslow.ffpreset b/ffpresets/libx264-veryslow.ffpreset index 0863299..57e808d 100644 --- a/ffpresets/libx264-veryslow.ffpreset +++ b/ffpresets/libx264-veryslow.ffpreset @@ -18,5 +18,5 @@ bf=8 refs=16 directpred=3 trellis=2 -flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree +flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip wpredp=2 diff --git a/ffpresets/libx264-veryslow_firstpass.ffpreset b/ffpresets/libx264-veryslow_firstpass.ffpreset index a000487..e04062d 100644 --- a/ffpresets/libx264-veryslow_firstpass.ffpreset +++ b/ffpresets/libx264-veryslow_firstpass.ffpreset @@ -18,5 +18,5 @@ bf=8 refs=1 directpred=3 trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree +flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip wpredp=2 |