diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 00:40:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 00:50:22 +0100 |
| commit | d3dfe99bc5292646cb5d7c55bf3dd9101019d50a (patch) | |
| tree | db5b55c1a11157538df73422710043f92f52c7d7 /libavcodec | |
| parent | 6e6033b793a3124a966f0d2c4fefb1bdfc660db9 (diff) | |
| download | ffmpeg-d3dfe99bc5292646cb5d7c55bf3dd9101019d50a.tar.gz | |
libgsmdec: fix decoding of non 8khz gsm files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libgsm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index 0ce174ac5f..e90bdf0c4e 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -156,7 +156,8 @@ static av_cold int libgsm_decode_init(AVCodecContext *avctx) { avctx->channels = 1; avctx->channel_layout = AV_CH_LAYOUT_MONO; - avctx->sample_rate = 8000; + if (!avctx->sample_rate) + avctx->sample_rate = 8000; avctx->sample_fmt = AV_SAMPLE_FMT_S16; s->state = gsm_create(); |