Do not set non_interleaved for DV-in-AVI.
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Mon, 25 Apr 2011 11:54:26 +0000 (13:54 +0200)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Mon, 25 Apr 2011 12:17:59 +0000 (14:17 +0200)
It does not make sense (DV is interleaved by design) and
it avoids a crash when the non-interleaved code tries to
use the priv_data of streams created by the DV demuxer.
The crash could be avoided differently, but then that stream
would still lack an index and would not play correctly in
non-interleaved mode.
Fixes e.g. samples/ffmpeg-bugs/roundup/issue1514/Dennis0002_video1.avi

libavformat/avidec.c

index 83c55d0..d8df55b 100644 (file)
@@ -734,6 +734,10 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
         if(st->nb_index_entries)
             break;
     }
+    // DV-in-AVI cannot be non-interleaved, if set this must be
+    // a mis-detection.
+    if(avi->dv_demux)
+        avi->non_interleaved=0;
     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;