diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-01 22:08:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-01 22:08:44 +0200 |
| commit | 58677d73ed43020ea0840e633588e344396ee256 (patch) | |
| tree | ee96724ecd357d71717e99263c4104ad380b79bc /libavcodec/libmp3lame.c | |
| parent | acc3c380cb010451e8e336b622e7ae446709d5c2 (diff) | |
| parent | 6248694861f0c414571fadba447a0c1cab95284e (diff) | |
| download | ffmpeg-58677d73ed43020ea0840e633588e344396ee256.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660
libmp3lame: fix typo
AVOptions: drop av_ prefix from static av_get_number().
libx264: use X264_THREADS_AUTO constant instead of 0.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libmp3lame.c')
| -rw-r--r-- | libavcodec/libmp3lame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index fae5131bb4..ec2155009b 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -72,7 +72,7 @@ static av_cold int MP3lame_encode_init(AVCodecContext *avctx) lame_set_VBR_quality(s->gfp, avctx->global_quality/(float)FF_QP2LAMBDA); } lame_set_bWriteVbrTag(s->gfp,0); -#if FF_API_LAME_GLOBAL_OPTIONS +#if FF_API_LAME_GLOBAL_OPTS s->reservoir = avctx->flags2 & CODEC_FLAG2_BIT_RESERVOIR; #endif lame_set_disable_reservoir(s->gfp, !s->reservoir); |