summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-09-24 17:09:59 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-09-24 17:09:59 +0000
commit26f5e1469f9469ab30e16d6311bdbcbc7e0790cf (patch)
treeb9b0d273744e239cd1f171d5eb07bf31f81c1726
parente774c41cab765f5d12ecfb31e5fa30df41230de0 (diff)
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
-rw-r--r--libavformat/mov.c2
1 files changed, 0 insertions, 2 deletions
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: