From c5b8acad731c06389b98df8248b6a536e1b7e58d Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Mon, 22 Oct 2012 15:43:59 -0400 Subject: libgsmdec: always set channel layout and sample rate at initialization Only mono 8kHz is supported. --- libavcodec/libgsm.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'libavcodec/libgsm.c') diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index e6d435b..afed710 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -29,6 +29,7 @@ #include +#include "libavutil/audioconvert.h" #include "avcodec.h" #include "internal.h" #include "gsm.h" @@ -149,19 +150,10 @@ typedef struct LibGSMDecodeContext { static av_cold int libgsm_decode_init(AVCodecContext *avctx) { LibGSMDecodeContext *s = avctx->priv_data; - if (avctx->channels > 1) { - av_log(avctx, AV_LOG_ERROR, "Mono required for GSM, got %d channels\n", - avctx->channels); - return -1; - } - - if (!avctx->channels) - avctx->channels = 1; - - if (!avctx->sample_rate) - avctx->sample_rate = 8000; - - avctx->sample_fmt = AV_SAMPLE_FMT_S16; + avctx->channels = 1; + avctx->channel_layout = AV_CH_LAYOUT_MONO; + avctx->sample_rate = 8000; + avctx->sample_fmt = AV_SAMPLE_FMT_S16; s->state = gsm_create(); -- cgit v1.1