diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-10-22 15:45:38 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-11-01 11:29:17 -0400 |
| commit | 32c7769e5c851ff7b47a83113b97a325dde7b442 (patch) | |
| tree | 3b8f369972c518d44ea123ea499c6748317a808d | |
| parent | c5b8acad731c06389b98df8248b6a536e1b7e58d (diff) | |
| download | ffmpeg-32c7769e5c851ff7b47a83113b97a325dde7b442.tar.gz | |
gsmdec: always set channel layout and sample rate at initialization
Only mono 8kHz is supported.
| -rw-r--r-- | libavcodec/gsmdec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index a5e0d7d73a..14b7e03047 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -24,6 +24,7 @@ * GSM decoder */ +#include "libavutil/audioconvert.h" #include "avcodec.h" #include "get_bits.h" #include "msgsmdec.h" @@ -34,10 +35,10 @@ static av_cold int gsm_init(AVCodecContext *avctx) { GSMContext *s = avctx->priv_data; - 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; switch (avctx->codec_id) { case AV_CODEC_ID_GSM: |