diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-22 09:55:34 +0400 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-31 12:24:17 +0400 |
| commit | 34dda1251d590df559f54f67b3a3a80e3f5835d7 (patch) | |
| tree | cf1d4ffd885d00f8559015dd5509f85d9a1ed578 /libavcodec/options.c | |
| parent | 5d4a1048ee251cf7cb2da7d24f23da6d8a34459a (diff) | |
libx264: add 'b-pyramid' private option.
Deprecate CODEC_FLAG2_BPYRAMID.
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 3ae621b3f3..6881f9cbf1 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -387,7 +387,9 @@ static const AVOption options[]={ {"bframebias", "influences how often B-frames are used", OFFSET(bframebias), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"trellis", "rate-distortion optimal quantization", OFFSET(trellis), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, {"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"}, {"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"}, |