diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-08-06 01:39:07 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-01-05 17:21:47 -0500 |
| commit | e361fde8b011bcd556057f949e984f58bfdaa974 (patch) | |
| tree | 8694879bde86d47465dc56b640a9343c873e6e12 | |
| parent | 1d7a453dcfe4edae7d08aed0bed5ccd993409d42 (diff) | |
| download | ffmpeg-e361fde8b011bcd556057f949e984f58bfdaa974.tar.gz | |
avi: properly fail if the dv demuxer is missing
CC: libav-stable@libav.org
(cherry picked from commit 1cac9accbd1f9b8596122d0735e37b97a844c514)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavformat/avidec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 414ed01c55..e0c1988803 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); |