diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-22 07:55:34 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-31 10:24:56 +0200 |
| commit | 0f29699db73d569307cac1abce64ae43647db2d2 (patch) | |
| tree | 9c6e9119c19c3927b94c4cea3dea3f764a116215 /libavcodec/options.c | |
| parent | 34dda1251d590df559f54f67b3a3a80e3f5835d7 (diff) | |
| download | ffmpeg-0f29699db73d569307cac1abce64ae43647db2d2.tar.gz | |
libx264: add 'weightb' private option.
Deprecate CODEC_FLAG2_BPYRAMID.
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 6881f9cbf1..90ffb1cf8a 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -389,8 +389,8 @@ static const AVOption options[]={ {"directpred", "direct mv prediction mode - 0 (none), 1 (spatial), 2 (temporal), 3 (auto)", OFFSET(directpred), FF_OPT_TYPE_INT, {.dbl = 2 }, INT_MIN, INT_MAX, V|E}, #if FF_API_X264_GLOBAL_OPTS {"bpyramid", "allows B-frames to be used as references for predicting", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_BPYRAMID }, INT_MIN, INT_MAX, V|E, "flags2"}, -#endif {"wpred", "weighted biprediction for b-frames (H.264)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_WPRED }, INT_MIN, INT_MAX, V|E, "flags2"}, +#endif {"mixed_refs", "one reference per partition, as opposed to one reference per macroblock", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_MIXED_REFS }, INT_MIN, INT_MAX, V|E, "flags2"}, {"dct8x8", "high profile 8x8 transform (H.264)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_8X8DCT }, INT_MIN, INT_MAX, V|E, "flags2"}, {"fastpskip", "fast pskip (H.264)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_FASTPSKIP }, INT_MIN, INT_MAX, V|E, "flags2"}, |