Changeset 1242

Timestamp:

01/09/10 03:32:39 (8 months ago)

Author:

astrange

Message:

Apply gbooker's patch fixing broken-index detection in the importer.

This allows incomplete AVI files to be fully imported again.

Closes #460

Location:

trunk

Files:

• ff_MovieImport.c (modified) (1 diff)
• ff_private.c (modified) (1 diff)

trunk/ff_MovieImport.c

@@ -481 +481 @@
         storage->format_context = ic;
         
+        // AVIs without an index currently add a few entries to the index so it can
+        // determine codec parameters.  Check for index existence here before it
+        // reads any packets.
+        hadIndex = 1;
+        for (j = 0; j < ic->nb_streams; j++) {
+                if (ic->streams[j]->nb_index_entries <= 1)
+                {
+                        hadIndex = 0;
+                        break;
+                }
+        }
+        
         /* Get the Stream Infos if not already read */
         result = av_find_stream_info(ic);

trunk/ff_private.c

@@ -805 +805 @@
         header_offset = storage->header_offset;
 
-        *hadIndex = 0;
-        
-        // AVIs without an index currently add one entry to the index; assume that
-        // such a small index means that we should idle import instead. It shouldn't 
-        // take much longer if the index really is this small anyways.
-        for (j = 0; j < ic->nb_streams; j++) {
-                if (map[j].str->nb_index_entries <= 1)
-                        goto bail;
-        }
-        
+        if(*hadIndex == 0)
+                goto bail;
+                
         //FLVs have unusable indexes, so don't even bother.
         if(storage->componentType == 'FLV ')