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

[bcoudurier]

Author: bcoudurier
Date: Thu Nov 25 06:03:29 2010
New Revision: 25825

Log:
In mov demuxer, if multiple h264 stsd are present, do not concatenate streams, fix #2069

Modified:
   trunk/libavformat/mov.c

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	Thu Nov 25 03:19:03 2010	(r25824)
+++ trunk/libavformat/mov.c	Thu Nov 25 06:03:29 2010	(r25825)
@@ -939,10 +939,14 @@ int ff_mov_read_stsd_entries(MOVContext 
             /* Multiple fourcc, we skip JPEG. This is not correct, we should
              * export it as a separate AVStream but this needs a few changes
              * in the MOV demuxer, patch welcome. */
+        multiple_stsd:
             av_log(c->fc, AV_LOG_WARNING, "multiple fourcc not supported\n");
             url_fskip(pb, size - (url_ftell(pb) - start_pos));
             continue;
         }
+        /* we cannot demux concatenated h264 streams because of different extradata */
+        if (st->codec->codec_tag && st->codec->codec_tag == AV_RL32("avc1"))
+            goto multiple_stsd;
         sc->pseudo_stream_id = st->codec->codec_tag ? -1 : pseudo_stream_id;
         sc->dref_id= dref_id;