Ticket #460: indexCheck.patch

ff_MovieImport.c

@@ -480 +480 @@
         require_noerr(result,bail);
         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);
         

ff_private.c

@@ -804 +804 @@
         ic = storage->format_context;
         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 ')
                 goto bail;