From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Wed, 24 Sep 2008 17:17:11 +0000 (+0000)
Subject: merge amr wb case with amr nb and qcelp
X-Git-Tag: v0.5~2431
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aeb627888d201c45b56e760c2aa595463aeb06f7;p=platform%2Fupstream%2Flibav.git

merge amr wb case with amr nb and qcelp

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7b3a6c9..aec9a9d 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;