From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Wed, 24 Sep 2008 17:09:59 +0000 (+0000)
Subject: do not override sample rate for amr nor qcelp, should fix some qcelp files at 16000hz
X-Git-Tag: v0.5~2433
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/26f5e1469f9469ab30e16d6311bdbcbc7e0790cf

do not override sample rate for amr nor qcelp, should fix some qcelp files at 16000hz

Originally committed as revision 15397 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 73ed11ddad..7b3a6c9755 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -986,13 +986,11 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 #endif
     /* no ifdef since parameters are always those */
     case CODEC_ID_AMR_WB:
-        st->codec->sample_rate= 16000;
         st->codec->channels= 1; /* really needed */
         break;
     case CODEC_ID_QCELP:
     case CODEC_ID_AMR_NB:
         st->codec->frame_size= sc->samples_per_frame;
-        st->codec->sample_rate= 8000;
         st->codec->channels= 1; /* really needed */
         break;
     case CODEC_ID_MP2: