diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-26 20:35:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-26 21:04:23 +0200 |
| commit | 1edf33f7f26c6538ee6bdc479a78bb7cdcb6c3c9 (patch) | |
| tree | 496d3dc83dea38cd5e326052c7f49012c77e3364 | |
| parent | d5a3635b2cb89c1d31b68bcb049c47c8d59e99fb (diff) | |
| download | ffmpeg-1edf33f7f26c6538ee6bdc479a78bb7cdcb6c3c9.tar.gz | |
ffmpeg: fix -b -ab mixes with -b overriding the audio bitrate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg.c | 10 | ||||
| -rwxr-xr-x | tests/codec-regression.sh | 2 |
2 files changed, 11 insertions, 1 deletions
@@ -4160,6 +4160,15 @@ static int opt_old2new(OptionsContext *o, const char *opt, const char *arg) return parse_option(o, s, arg, options); } +static int opt_bitrate(OptionsContext *o, const char *opt, const char *arg) +{ + if(!strcmp(opt, "b")){ + av_log(0,AV_LOG_WARNING, "Please use -b:a or -b:v, -b is ambigous\n"); + return parse_option(o, av_strdup("b:v"), arg, options); + } + return opt_default(opt, arg); +} + static int opt_video_filters(OptionsContext *o, const char *opt, const char *arg) { return parse_option(o, "filter:v", arg, options); @@ -4259,6 +4268,7 @@ static const OptionDef options[] = { { "force_fps", OPT_BOOL | OPT_EXPERT | OPT_VIDEO | OPT_SPEC, {.off = OFFSET(force_fps)}, "force the selected framerate, disable the best supported framerate selection" }, { "streamid", HAS_ARG | OPT_EXPERT | OPT_FUNC2, {(void*)opt_streamid}, "set the value of an outfile streamid", "streamIndex:value" }, { "force_key_frames", OPT_STRING | HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_SPEC, {.off = OFFSET(forced_key_frames)}, "force key frames at specified timestamps", "timestamps" }, + { "b", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_bitrate}, "video bitrate (please use -b:v)", "bitrate" }, /* audio options */ { "aframes", HAS_ARG | OPT_AUDIO | OPT_FUNC2, {(void*)opt_audio_frames}, "set the number of audio frames to record", "number" }, diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index cffe2439da..3665b12057 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -300,7 +300,7 @@ do_audio_encoding ac3.rm "-vn -acodec ac3_fixed" fi if [ -n "$do_g726" ] ; then -do_audio_encoding g726.wav "-b 32k -ac 1 -ar 8000 -acodec g726" +do_audio_encoding g726.wav "-b:a 32k -ac 1 -ar 8000 -acodec g726" do_audio_decoding fi |