diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-27 10:16:14 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-31 13:24:02 +0200 |
| commit | 0dc5e12f1e16d22aca861d42de9c4fd400df46ae (patch) | |
| tree | 6d414d1055ef5ff5e0ee4e8a5c4d0799e8ffd230 /libavcodec/options.c | |
| parent | 38934f19fe624270fabf32a411d84f1fee3e0aae (diff) | |
| download | ffmpeg-0dc5e12f1e16d22aca861d42de9c4fd400df46ae.tar.gz | |
libx264: add 'mbtree' private option.
Deprecate CODEC_FLAG2_MBTREE
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 e7e79831d8..4ad86e6c15 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -434,7 +434,9 @@ static const AVOption options[]={ #if FF_API_LAME_GLOBAL_OPTS {"reservoir", "use bit reservoir", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_BIT_RESERVOIR }, INT_MIN, INT_MAX, A|E, "flags2"}, #endif +#if FF_API_X264_GLOBAL_OPTS {"mbtree", "use macroblock tree ratecontrol (x264 only)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_MBTREE }, INT_MIN, INT_MAX, V|E, "flags2"}, +#endif {"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, {"channel_layout", NULL, OFFSET(channel_layout), FF_OPT_TYPE_INT64, {.dbl = DEFAULT }, 0, INT64_MAX, A|E|D, "channel_layout"}, {"request_channel_layout", NULL, OFFSET(request_channel_layout), FF_OPT_TYPE_INT64, {.dbl = DEFAULT }, 0, INT64_MAX, A|D, "request_channel_layout"}, |