diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-09 13:56:36 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-16 06:20:43 +0200 |
| commit | 64db1a82d663958593f66ff7bf351d6a670e51a4 (patch) | |
| tree | e209ab3b098935cfb00c135211904ea878e45a58 /libavcodec | |
| parent | f4ad238c6c696f021e53eae8f255c2d1b79fefbb (diff) | |
lavc: add audio flag to the 'b' option, deprecate 'ab'.
Its only reason for its existence was ffmpeg's inability to properly assign
AVOptions to streams. Now this is not a problem anymore, so 'ab' should
go.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/options.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 1ee02c0417..f19928cd86 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -70,8 +70,8 @@ static const AVOption *opt_find(void *obj, const char *name, const char *unit, i #define AV_CODEC_DEFAULT_BITRATE 200*1000 static const AVOption options[]={ -{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), FF_OPT_TYPE_INT, {.dbl = AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, V|E}, -{"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), FF_OPT_TYPE_INT, {.dbl = AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, A|E}, +{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), FF_OPT_TYPE_INT, {.dbl = AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, V|A|E}, +{"ab", "this option is deprecated, use b", OFFSET(bit_rate), FF_OPT_TYPE_INT, {.dbl = AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, A|E}, {"bt", "set video bitrate tolerance (in bits/s)", OFFSET(bit_rate_tolerance), FF_OPT_TYPE_INT, {.dbl = AV_CODEC_DEFAULT_BITRATE*20 }, 1, INT_MAX, V|E}, {"flags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, {.dbl = DEFAULT }, 0, UINT_MAX, V|A|E|D, "flags"}, {"mv4", "use four motion vector by macroblock (mpeg4)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_4MV }, INT_MIN, INT_MAX, V|E, "flags"}, |