[FFmpeg-cvslog] r12941 - trunk/libavformat/mov.c

[bcoudurier]

Author: bcoudurier
Date: Thu Apr 24 19:17:41 2008
New Revision: 12941

Log:
demux qcelp, so this can work with soc decoder and stream copy

Modified:
   trunk/libavformat/mov.c

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	(original)
+++ trunk/libavformat/mov.c	Thu Apr 24 19:17:41 2008
@@ -922,6 +922,9 @@ static int mov_read_stsd(MOVContext *c, 
         st->codec->sample_rate= 16000;
         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->sample_rate= 8000;
         st->codec->channels= 1; /* really needed */
@@ -1252,7 +1255,8 @@ static int mov_read_trak(MOVContext *c, 
         sc->time_scale= c->time_scale;
     av_set_pts_info(st, 64, sc->time_rate, sc->time_scale);
 
-    if (st->codec->codec_type == CODEC_TYPE_AUDIO && sc->stts_count == 1)
+    if (st->codec->codec_type == CODEC_TYPE_AUDIO &&
+        !st->codec->frame_size && sc->stts_count == 1)
         st->codec->frame_size = av_rescale(sc->time_rate, st->codec->sample_rate, sc->time_scale);
 
     if(st->duration != AV_NOPTS_VALUE){