diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-02 14:15:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-02 14:20:33 +0100 |
| commit | 6788350281c418f0f395a8279eee82f7abe7c63b (patch) | |
| tree | 69cd76f699eff929f5b13f76b42eabc7f25f9355 /libavcodec/gsmdec.c | |
| parent | 00aa7fa786e41b5fc8404732453869aa3c14e33a (diff) | |
| parent | 50a65e7a540ce6747f81d6dbf6a602ad35be77ff (diff) | |
| download | ffmpeg-6788350281c418f0f395a8279eee82f7abe7c63b.tar.gz | |
Merge commit '50a65e7a540ce6747f81d6dbf6a602ad35be77ff'
* commit '50a65e7a540ce6747f81d6dbf6a602ad35be77ff': (24 commits)
vmdaudio: set channel layout
twinvq: validate sample rate code
twinvq: set channel layout
twinvq: validate that channels is not <= 0
truespeech: set channel layout
sipr: set channel layout
shorten: validate that the channel count in the header is not <= 0
ra288dec: set channel layout
ra144dec: set channel layout
qdm2: remove unneeded checks for channel count
qdm2: make sure channels is not <= 0 and set channel layout
qcelpdec: set channel layout
nellymoserdec: set channels to 1
libopencore-amr: set channel layout for amr-nb or if not set by the user
libilbc: set channel layout
dpcm: use AVCodecContext.channels instead of keeping a private copy
imc: set channels to 1 instead of validating it
gsmdec: always set channel layout and sample rate at initialization
libgsmdec: always set channel layout and sample rate at initialization
g726dec: do not validate sample rate
...
Conflicts:
libavcodec/dpcm.c
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsmdec.c')
| -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 fc042fbd7b..f51a083085 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: |