[FFmpeg-cvslog] r23230 - in branches/0.6: . libavformat/avidec.c

[siretart]

Author: siretart
Date: Fri May 21 22:24:08 2010
New Revision: 23230

Log:
Disable non interleaved avi code when there is no index available.
Fixes issue1956.


backport r23202 by michael

Modified:
   branches/0.6/   (props changed)
   branches/0.6/libavformat/avidec.c

Modified: branches/0.6/libavformat/avidec.c
==============================================================================
--- branches/0.6/libavformat/avidec.c	Fri May 21 22:23:22 2010	(r23229)
+++ branches/0.6/libavformat/avidec.c	Fri May 21 22:24:08 2010	(r23230)
@@ -650,6 +650,16 @@ static int avi_read_header(AVFormatConte
         avi_load_index(s);
     avi->index_loaded = 1;
     avi->non_interleaved |= guess_ni_flag(s);
+    for(i=0; i<s->nb_streams; i++){
+        AVStream *st = s->streams[i];
+        if(st->nb_index_entries)
+            break;
+    }
+    if(i==s->nb_streams && avi->non_interleaved) {
+        av_log(s, AV_LOG_WARNING, "non-interleaved AVI without index, switching to interleaved\n");
+        avi->non_interleaved=0;
+    }
+
     if(avi->non_interleaved) {
         av_log(s, AV_LOG_INFO, "non-interleaved AVI\n");
         clean_index(s);