[SCM] libav/experimental: add a -ab with default of 64k change -b to only apply to video this returns -ab/-b to the old defautls and old behavior regarding ordering of them

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6289025d8c21ea19feddba7afec3b950ad4d502c
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Mar 7 09:51:45 2007 +0000

    add a -ab with default of 64k
    change -b to only apply to video
    this returns -ab/-b to the old defautls and old behavior regarding ordering of them
    
    Originally committed as revision 8286 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0e6efbd..6573e3c 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -411,7 +411,8 @@ static const char* context_to_name(void* ptr) {
 #define AV_CODEC_DEFAULT_BITRATE 200*1000
 
 static const AVOption options[]={
-{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), FF_OPT_TYPE_INT, AV_CODEC_DEFAULT_BITRATE, INT_MIN, INT_MAX, V|A|E},
+{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), FF_OPT_TYPE_INT, AV_CODEC_DEFAULT_BITRATE, INT_MIN, INT_MAX, V|E},
+{"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), FF_OPT_TYPE_INT, 64*1000, INT_MIN, INT_MAX, A|E},
 {"bt", "set video bitrate tolerance (in bits/s)", OFFSET(bit_rate_tolerance), FF_OPT_TYPE_INT, AV_CODEC_DEFAULT_BITRATE*20, 1, INT_MAX, V|E},
 {"flags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, DEFAULT, INT_MIN, INT_MAX, V|A|E|D, "flags"},
 {"mv4", "use four motion vector by macroblock (mpeg4)", 0, FF_OPT_TYPE_CONST, CODEC_FLAG_4MV, INT_MIN, INT_MAX, V|E, "flags"},

-- 
Libav/FFmpeg packaging