[SCM] libav/experimental: skip top-level objects to search for the simple index in ASF files

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 77b7c334be9712af37ad7062179e8043b83ffc76
Author: Stefan Gehrer <stefan.gehrer at gmx.de>
Date:   Fri Dec 3 07:49:07 2010 +0000

    skip top-level objects to search for the simple index in ASF files
    
    Originally committed as revision 25863 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index b4be9d4..59f670b 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1138,7 +1138,20 @@ static void asf_build_simple_index(AVFormatContext *s, int stream_index)
 
     url_fseek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET);
     get_guid(s->pb, &g);
-    if (!guidcmp(&g, &index_guid)) {
+
+    /* the data object can be followed by other top-level objects,
+       skip them until the simple index object is reached */
+    while (guidcmp(&g, &index_guid)) {
+        int64_t gsize= get_le64(s->pb);
+        if (gsize < 24 || url_feof(s->pb)) {
+            url_fseek(s->pb, current_pos, SEEK_SET);
+            return;
+        }
+        url_fseek(s->pb, gsize-24, SEEK_CUR);
+        get_guid(s->pb, &g);
+    }
+
+    {
         int64_t itime, last_pos=-1;
         int pct, ict;
         int64_t av_unused gsize= get_le64(s->pb);

-- 
Libav/FFmpeg packaging