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

[bcoudurier]

Author: bcoudurier
Date: Thu Mar 27 13:35:22 2008
New Revision: 12603

Log:
Only use chunk demuxing for old uncompressed audio mechanism specified by stts.
This will split amr/aac cbr samples correctly in isom files which do not
set audio cid to -2.


Modified:
   trunk/libavformat/mov.c

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	(original)
+++ trunk/libavformat/mov.c	Thu Mar 27 13:35:22 2008
@@ -1120,8 +1120,9 @@ static void mov_build_index(MOVContext *
     unsigned int stss_index = 0;
     unsigned int i, j;
 
-    if (sc->sample_sizes || st->codec->codec_type == CODEC_TYPE_VIDEO ||
-        sc->audio_cid == -2) {
+    /* only use old uncompressed audio chunk demuxing when stts specifies it */
+    if (!(st->codec->codec_type == CODEC_TYPE_AUDIO &&
+          sc->stts_count == 1 && sc->stts_data[0].duration == 1)) {
         unsigned int current_sample = 0;
         unsigned int stts_sample = 0;
         unsigned int keyframe, sample_size;