diff options
Diffstat (limited to 'lib/ffmpeg/libavcodec/libmp3lame.c')
| -rw-r--r-- | lib/ffmpeg/libavcodec/libmp3lame.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/ffmpeg/libavcodec/libmp3lame.c b/lib/ffmpeg/libavcodec/libmp3lame.c index 1d74d6d59d..db0bc8259c 100644 --- a/lib/ffmpeg/libavcodec/libmp3lame.c +++ b/lib/ffmpeg/libavcodec/libmp3lame.c @@ -55,13 +55,12 @@ static av_cold int MP3lame_encode_init(AVCodecContext *avctx) } else { lame_set_quality(s->gfp, avctx->compression_level); } - /* lame 3.91 doesn't work in mono */ - lame_set_mode(s->gfp, JOINT_STEREO); + lame_set_mode(s->gfp, s->stereo ? JOINT_STEREO : MONO); lame_set_brate(s->gfp, avctx->bit_rate/1000); if(avctx->flags & CODEC_FLAG_QSCALE) { lame_set_brate(s->gfp, 0); lame_set_VBR(s->gfp, vbr_default); - lame_set_VBR_q(s->gfp, avctx->global_quality / (float)FF_QP2LAMBDA); + lame_set_VBR_quality(s->gfp, avctx->global_quality/(float)FF_QP2LAMBDA); } lame_set_bWriteVbrTag(s->gfp,0); lame_set_disable_reservoir(s->gfp, avctx->flags2 & CODEC_FLAG2_BIT_RESERVOIR ? 0 : 1); @@ -214,7 +213,7 @@ static av_cold int MP3lame_encode_close(AVCodecContext *avctx) } -AVCodec libmp3lame_encoder = { +AVCodec ff_libmp3lame_encoder = { "libmp3lame", AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3, @@ -223,7 +222,7 @@ AVCodec libmp3lame_encoder = { MP3lame_encode_frame, MP3lame_encode_close, .capabilities= CODEC_CAP_DELAY, - .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, + .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .supported_samplerates= sSampleRates, .long_name= NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"), }; |