Merge commit '65830277d2d2ee3658e1f070a61044fff261ed3e' into release/1.1

[ffmpeg.git] / libavformat / avidec.c

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index f33d3a7..d48829e 100644 (file)
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -490,7 +490,8 @@ static int avi_read_header(AVFormatContext *s)
                     avi->dv_demux = avpriv_dv_init_demux(s);
                     if (!avi->dv_demux)
                         goto fail;
-                }
+                } else
+                    goto fail;
                 s->streams[0]->priv_data = ast;
                 avio_skip(pb, 3 * 4);
                 ast->scale = avio_rl32(pb);
@@ -1067,6 +1068,8 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
         int size = avpriv_dv_get_packet(avi->dv_demux, pkt);
         if (size >= 0)
             return size;
+        else
+            goto resync;
     }
 
     if(avi->non_interleaved){