diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-09-24 17:17:11 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-09-24 17:17:11 +0000 |
| commit | aeb627888d201c45b56e760c2aa595463aeb06f7 (patch) | |
| tree | e7652701d420a95377a9496ab840a48a2a32189a /libavformat/mov.c | |
| parent | 637b638e1eea5d3f41553637dfa8a13daf119273 (diff) | |
| download | ffmpeg-aeb627888d201c45b56e760c2aa595463aeb06f7.tar.gz | |
merge amr wb case with amr nb and qcelp
Originally committed as revision 15399 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 7b3a6c9755..aec9a9d3c4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -985,11 +985,9 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) break; #endif /* no ifdef since parameters are always those */ - case CODEC_ID_AMR_WB: - st->codec->channels= 1; /* really needed */ - break; case CODEC_ID_QCELP: case CODEC_ID_AMR_NB: + case CODEC_ID_AMR_WB: st->codec->frame_size= sc->samples_per_frame; st->codec->channels= 1; /* really needed */ break; |