summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-04-25 13:34:51 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-04-25 13:34:51 +0000
commit8cd92bb915c4918a61d11068a4f8ed3296694dc3 (patch)
tree16e1c3f7b24bfaf5cf6a7fd852af8a23bf42a25d /libavformat
parent202aca676f09b803645a6f32715162c76a41d772 (diff)
parser should not be needed anymore, merge cases and set frame size for amr too
Originally committed as revision 12956 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2d992e19df..f3fe62a9da 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -925,9 +925,8 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
st->codec->channels= 1; /* really needed */
break;
case CODEC_ID_QCELP:
- st->codec->frame_size = sc->samples_per_frame;
- st->need_parsing= AVSTREAM_PARSE_FULL;
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;