diff options
Diffstat (limited to 'libavcodec/libtwolame.c')
| -rw-r--r-- | libavcodec/libtwolame.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavcodec/libtwolame.c b/libavcodec/libtwolame.c index ce3294126a..dc188575b5 100644 --- a/libavcodec/libtwolame.c +++ b/libavcodec/libtwolame.c @@ -2,20 +2,20 @@ * Interface to libtwolame for mp2 encoding * Copyright (c) 2012 Paul B Mahol * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -77,6 +77,10 @@ static av_cold int twolame_encode_init(AVCodecContext *avctx) twolame_set_num_channels(s->glopts, avctx->channels); twolame_set_in_samplerate(s->glopts, avctx->sample_rate); twolame_set_out_samplerate(s->glopts, avctx->sample_rate); + + if (!avctx->bit_rate) + avctx->bit_rate = avctx->sample_rate < 28000 ? 160000 : 384000; + if (avctx->flags & CODEC_FLAG_QSCALE || !avctx->bit_rate) { twolame_set_VBR(s->glopts, TRUE); twolame_set_VBR_level(s->glopts, @@ -102,7 +106,7 @@ static int twolame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, TWOLAMEContext *s = avctx->priv_data; int ret; - if ((ret = ff_alloc_packet(avpkt, MPA_MAX_CODED_FRAME_SIZE)) < 0) + if ((ret = ff_alloc_packet2(avctx, avpkt, MPA_MAX_CODED_FRAME_SIZE)) < 0) return ret; if (frame) { @@ -190,7 +194,7 @@ static const AVClass twolame_class = { }; static const AVCodecDefault twolame_defaults[] = { - { "b", "384000" }, + { "b", "0" }, { NULL }, }; |