]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
merge amr wb case with amr nb and qcelp
authorbcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Wed, 24 Sep 2008 17:17:11 +0000 (17:17 +0000)
committerbcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Wed, 24 Sep 2008 17:17:11 +0000 (17:17 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15399 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavformat/mov.c

index 7b3a6c975528813434d0a2d78d12451f4d8c9037..aec9a9d3c4c5f7dbe368fb71e90c1fa7b2830496 100644 (file)
@@ -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;