[FFmpeg-cvslog] libgsmdec: fix decoding of non 8khz gsm files

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  3 00:40:19 2012 +0100| [d3dfe99bc5292646cb5d7c55bf3dd9101019d50a] | committer: Michael Niedermayer

libgsmdec: fix decoding of non 8khz gsm files

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3dfe99bc5292646cb5d7c55bf3dd9101019d50a
---

 libavcodec/libgsm.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c
index 0ce174a..e90bdf0 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();