[FFmpeg-cvslog] Set frame_size for AMR_NB in mov.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Nov  3 20:20:58 2011 +0100| [a487378ef535d149cf2c8633c1f901d875d039ef] | committer: Carl Eugen Hoyos

Set frame_size for AMR_NB in mov.

This copies the behaviour of the amr demuxer.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a487378ef535d149cf2c8633c1f901d875d039ef
---

 libavformat/mov.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 62d5b3c..c90004c 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1350,10 +1350,13 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
         st->codec->frame_size= sc->samples_per_frame;
         st->codec->channels= 1; /* really needed */
         /* force sample rate for amr, stsd in 3gp does not store sample rate */
-        if (st->codec->codec_id == CODEC_ID_AMR_NB)
+        if (st->codec->codec_id == CODEC_ID_AMR_NB) {
             st->codec->sample_rate = 8000;
-        else if (st->codec->codec_id == CODEC_ID_AMR_WB)
+            st->codec->frame_size  = 160;
+        } else if (st->codec->codec_id == CODEC_ID_AMR_WB) {
             st->codec->sample_rate = 16000;
+            st->codec->frame_size  = 320;
+        }
         break;
     case CODEC_ID_MP2:
     case CODEC_ID_MP3: