From dbc7c6121e563f07b708f2facf7b623ddbfda717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Sat, 28 Jan 2012 23:15:02 +0100 Subject: [PATCH] libgsm: Fix compilation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move libgsm_encode_close before its first use and call it with the correct number of arguments. Signed-off-by: Reimar Döffinger --- libavcodec/libgsm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index 919387492c..1a2145581a 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -32,6 +32,13 @@ #include "avcodec.h" #include "gsm.h" +static av_cold int libgsm_encode_close(AVCodecContext *avctx) { + av_freep(&avctx->coded_frame); + 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", @@ -77,17 +84,10 @@ static av_cold int libgsm_encode_init(AVCodecContext *avctx) { return 0; error: - libgsm_encode_close(); + libgsm_encode_close(avctx); return -1; } -static av_cold int libgsm_encode_close(AVCodecContext *avctx) { - av_freep(&avctx->coded_frame); - gsm_destroy(avctx->priv_data); - avctx->priv_data = NULL; - return 0; -} - static int libgsm_encode_frame(AVCodecContext *avctx, unsigned char *frame, int buf_size, void *data) { // we need a full block