Revision dac99c35

View differences:

ffpresets/libx264-baseline.ffpreset
1 1
coder=0
2 2
bf=0
3
flags2=-wpred-dct8x8+mbtree
3
flags2=-wpred-dct8x8
4 4
wpredp=0
ffpresets/libx264-default.ffpreset
18 18
refs=3
19 19
directpred=1
20 20
trellis=1
21
flags2=+mixed_refs+wpred+dct8x8+fastpskip+mbtree
21
flags2=+mixed_refs+wpred+dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-fast.ffpreset
18 18
refs=2
19 19
directpred=1
20 20
trellis=1
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-fast_firstpass.ffpreset
18 18
refs=1
19 19
directpred=1
20 20
trellis=0
21
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
21
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-fastfirstpass.ffpreset
18 18
refs=1
19 19
directpred=3
20 20
trellis=0
21
flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip+mbtree
21
flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-hq.ffpreset
18 18
refs=4
19 19
directpred=3
20 20
trellis=1
21
flags2=+wpred+mixed_refs+dct8x8+fastpskip+mbtree
21
flags2=+wpred+mixed_refs+dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-ipod320.ffpreset
1 1
coder=0
2 2
bf=0
3
flags2=-wpred-dct8x8+mbtree
3
flags2=-wpred-dct8x8
4 4
level=13
5 5
maxrate=768000
6 6
bufsize=3000000
ffpresets/libx264-ipod640.ffpreset
1 1
coder=0
2 2
bf=0
3 3
refs=1
4
flags2=-wpred-dct8x8+mbtree
4
flags2=-wpred-dct8x8
5 5
level=30
6 6
maxrate=10000000
7 7
bufsize=10000000
ffpresets/libx264-lossless_fast.ffpreset
15 15
qmax=51
16 16
qdiff=4
17 17
directpred=1
18
flags2=+fastpskip+mbtree
18
flags2=+fastpskip
19 19
cqp=0
20 20
wpredp=0
ffpresets/libx264-lossless_max.ffpreset
16 16
qdiff=4
17 17
refs=16
18 18
directpred=1
19
flags2=+mixed_refs+dct8x8+fastpskip+mbtree
19
flags2=+mixed_refs+dct8x8+fastpskip
20 20
cqp=0
21 21
wpredp=2
ffpresets/libx264-lossless_medium.ffpreset
15 15
qmax=51
16 16
qdiff=4
17 17
directpred=1
18
flags2=+fastpskip+mbtree
18
flags2=+fastpskip
19 19
cqp=0
20 20
wpredp=2
ffpresets/libx264-lossless_slow.ffpreset
16 16
qdiff=4
17 17
refs=2
18 18
directpred=1
19
flags2=+dct8x8+fastpskip+mbtree
19
flags2=+dct8x8+fastpskip
20 20
cqp=0
21 21
wpredp=2
ffpresets/libx264-lossless_slower.ffpreset
16 16
qdiff=4
17 17
refs=4
18 18
directpred=1
19
flags2=+mixed_refs+dct8x8+fastpskip+mbtree
19
flags2=+mixed_refs+dct8x8+fastpskip
20 20
cqp=0
21 21
wpredp=2
ffpresets/libx264-lossless_ultrafast.ffpreset
15 15
qmax=51
16 16
qdiff=4
17 17
directpred=1
18
flags2=+fastpskip+mbtree
18
flags2=+fastpskip
19 19
cqp=0
ffpresets/libx264-main.ffpreset
1
flags2=-dct8x8+mbtree
1
flags2=-dct8x8
ffpresets/libx264-max.ffpreset
18 18
refs=16
19 19
directpred=3
20 20
trellis=2
21
flags2=+wpred+mixed_refs+dct8x8-fastpskip+mbtree
21
flags2=+wpred+mixed_refs+dct8x8-fastpskip
22 22
wpredp=2
ffpresets/libx264-medium.ffpreset
18 18
refs=3
19 19
directpred=1
20 20
trellis=1
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-medium_firstpass.ffpreset
18 18
refs=1
19 19
directpred=1
20 20
trellis=0
21
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
21
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-normal.ffpreset
18 18
refs=2
19 19
directpred=3
20 20
trellis=0
21
flags2=+wpred+dct8x8+fastpskip+mbtree
21
flags2=+wpred+dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-placebo.ffpreset
18 18
refs=16
19 19
directpred=3
20 20
trellis=2
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip+mbtree
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip
22 22
wpredp=2
ffpresets/libx264-placebo_firstpass.ffpreset
18 18
refs=16
19 19
directpred=3
20 20
trellis=2
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip+mbtree
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip
22 22
wpredp=2
ffpresets/libx264-slow.ffpreset
18 18
refs=5
19 19
directpred=3
20 20
trellis=1
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-slow_firstpass.ffpreset
18 18
refs=1
19 19
directpred=3
20 20
trellis=0
21
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
21
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-slower.ffpreset
18 18
refs=8
19 19
directpred=3
20 20
trellis=2
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-slower_firstpass.ffpreset
18 18
refs=1
19 19
directpred=3
20 20
trellis=0
21
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
21
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-slowfirstpass.ffpreset
18 18
refs=1
19 19
directpred=3
20 20
trellis=0
21
flags2=+wpred+dct8x8+fastpskip+mbtree
21
flags2=+wpred+dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-veryslow.ffpreset
18 18
refs=16
19 19
directpred=3
20 20
trellis=2
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
21
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
22 22
wpredp=2
ffpresets/libx264-veryslow_firstpass.ffpreset
18 18
refs=1
19 19
directpred=3
20 20
trellis=0
21
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
21
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
22 22
wpredp=2
libavcodec/options.c
307 307
{"nr", "noise reduction", OFFSET(noise_reduction), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
308 308
{"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
309 309
{"inter_threshold", NULL, OFFSET(inter_threshold), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
310
{"flags2", NULL, OFFSET(flags2), FF_OPT_TYPE_FLAGS, CODEC_FLAG2_FASTPSKIP|CODEC_FLAG2_BIT_RESERVOIR|CODEC_FLAG2_PSY, 0, UINT_MAX, V|A|E|D, "flags2"},
310
{"flags2", NULL, OFFSET(flags2), FF_OPT_TYPE_FLAGS, CODEC_FLAG2_FASTPSKIP|CODEC_FLAG2_BIT_RESERVOIR|CODEC_FLAG2_PSY|CODEC_FLAG2_MBTREE, 0, UINT_MAX, V|A|E|D, "flags2"},
311 311
{"error", NULL, OFFSET(error_rate), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
312 312
{"antialias", "MP3 antialias algorithm", OFFSET(antialias_algo), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D, "aa"},
313 313
{"auto", NULL, 0, FF_OPT_TYPE_CONST, FF_AA_AUTO, INT_MIN, INT_MAX, V|D, "aa"},

Also available in: Unified diff