[FFmpeg-devel] [PATCH][RFC] Revert "Demux all parts of concatenated H.264."

[Derek Buitenhuis]

This broke decoding with other samples.

This reverts commit 34751f8313a41bf94e004ffa9491f35d96763558.
---
I can provide a sample which this fixes privately to you guys.
PM me or send me an email.

I was not able to download the original sample which it fixes,
which is listed as:

http://playlist.yahoo.com/makeplaylist.dll?sid=128114687&sdm=web&pt=rd

I have CC'd the original patch author.
---
 libavformat/mov.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 8b1ef01..9f69656 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1600,12 +1600,15 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
          * 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");
         avio_skip(pb, size);
         return 1;
     }
-    if (codec_tag == AV_RL32("avc1"))
+    if (codec_tag == AV_RL32("avc1")) {
         av_log(c->fc, AV_LOG_WARNING, "Concatenated H.264 might not play corrently.\n");
+        goto multiple_stsd;
+    }
 
     return 0;
 }
-- 
1.7.1