diff options
Diffstat (limited to 'libavcodec/libilbc.c')
| -rw-r--r-- | libavcodec/libilbc.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c index af693bd728..898fe83b1c 100644 --- a/libavcodec/libilbc.c +++ b/libavcodec/libilbc.c @@ -2,20 +2,20 @@ * iLBC decoder/encoder stub * Copyright (c) 2012 Martin Storsjo * - * 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 */ @@ -51,7 +51,10 @@ static const AVOption ilbc_dec_options[] = { }; static const AVClass ilbc_dec_class = { - "libilbc", av_default_item_name, ilbc_dec_options, LIBAVUTIL_VERSION_INT + .class_name = "libilbc", + .item_name = av_default_item_name, + .option = ilbc_dec_options, + .version = LIBAVUTIL_VERSION_INT, }; static av_cold int ilbc_decode_init(AVCodecContext *avctx) @@ -90,10 +93,8 @@ static int ilbc_decode_frame(AVCodecContext *avctx, void *data, } frame->nb_samples = s->decoder.blockl; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - } WebRtcIlbcfix_DecodeImpl((WebRtc_Word16*) frame->data[0], (const WebRtc_UWord16*) buf, &s->decoder, 1); @@ -127,7 +128,10 @@ static const AVOption ilbc_enc_options[] = { }; static const AVClass ilbc_enc_class = { - "libilbc", av_default_item_name, ilbc_enc_options, LIBAVUTIL_VERSION_INT + .class_name = "libilbc", + .item_name = av_default_item_name, + .option = ilbc_enc_options, + .version = LIBAVUTIL_VERSION_INT, }; static av_cold int ilbc_encode_init(AVCodecContext *avctx) @@ -163,10 +167,8 @@ static int ilbc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, ILBCEncContext *s = avctx->priv_data; int ret; - if ((ret = ff_alloc_packet(avpkt, 50))) { - av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n"); + if ((ret = ff_alloc_packet2(avctx, avpkt, 50)) < 0) return ret; - } WebRtcIlbcfix_EncodeImpl((WebRtc_UWord16*) avpkt->data, (const WebRtc_Word16*) frame->data[0], &s->encoder); |