[FFmpeg-cvslog] avi: properly fail if the dv demuxer is missing

[Luca Barbato]

ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero at gentoo.org> | Tue Aug  6 01:39:07 2013 +0200| [e361fde8b011bcd556057f949e984f58bfdaa974] | committer: Reinhard Tartler

avi: properly fail if the dv demuxer is missing

CC: libav-stable at libav.org
(cherry picked from commit 1cac9accbd1f9b8596122d0735e37b97a844c514)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e361fde8b011bcd556057f949e984f58bfdaa974
---

 libavformat/avidec.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 414ed01..e0c1988 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -463,7 +463,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);