diff options
Diffstat (limited to 'libavcodec/libgsmenc.c')
| -rw-r--r-- | libavcodec/libgsmenc.c | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/libavcodec/libgsmenc.c b/libavcodec/libgsmenc.c index 8f51321d46..b06ec6498b 100644 --- a/libavcodec/libgsmenc.c +++ b/libavcodec/libgsmenc.c @@ -3,20 +3,20 @@ * Copyright (c) 2005 Alban Bedel <albeu@free.fr> * Copyright (c) 2006, 2007 Michel Bardiaux <mbardiaux@mediaxim.be> * - * 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 */ @@ -40,6 +40,12 @@ #include "internal.h" #include "gsm.h" +static av_cold int libgsm_encode_close(AVCodecContext *avctx) { + gsm_destroy(avctx->priv_data); + avctx->priv_data = NULL; + return 0; +} + static av_cold int libgsm_encode_init(AVCodecContext *avctx) { if (avctx->channels > 1) { av_log(avctx, AV_LOG_ERROR, "Mono required for GSM, got %d channels\n", @@ -63,6 +69,8 @@ static av_cold int libgsm_encode_init(AVCodecContext *avctx) { } avctx->priv_data = gsm_create(); + if (!avctx->priv_data) + goto error; switch(avctx->codec_id) { case AV_CODEC_ID_GSM: @@ -78,12 +86,9 @@ static av_cold int libgsm_encode_init(AVCodecContext *avctx) { } return 0; -} - -static av_cold int libgsm_encode_close(AVCodecContext *avctx) { - gsm_destroy(avctx->priv_data); - avctx->priv_data = NULL; - return 0; +error: + libgsm_encode_close(avctx); + return -1; } static int libgsm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, @@ -93,10 +98,8 @@ static int libgsm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, gsm_signal *samples = (gsm_signal *)frame->data[0]; struct gsm_state *state = avctx->priv_data; - if ((ret = ff_alloc_packet(avpkt, avctx->block_align))) { - av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n"); + if ((ret = ff_alloc_packet2(avctx, avpkt, avctx->block_align)) < 0) return ret; - } switch(avctx->codec_id) { case AV_CODEC_ID_GSM: @@ -112,6 +115,7 @@ static int libgsm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } +#if CONFIG_LIBGSM_ENCODER AVCodec ff_libgsm_encoder = { .name = "libgsm", .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), @@ -123,7 +127,8 @@ AVCodec ff_libgsm_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, }; - +#endif +#if CONFIG_LIBGSM_MS_ENCODER AVCodec ff_libgsm_ms_encoder = { .name = "libgsm_ms", .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), @@ -135,3 +140,4 @@ AVCodec ff_libgsm_ms_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, }; +#endif |