diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 10:38:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 10:40:33 +0200 |
| commit | c589c4c52d130ab07d0b183db129adcc3bb7d39c (patch) | |
| tree | cf72da2ccb18cfbbfd66b4eade1e1cb370291221 /libavformat/avidec.c | |
| parent | e96c80154f7c8332530b39f490d604d79a106768 (diff) | |
| parent | 1cac9accbd1f9b8596122d0735e37b97a844c514 (diff) | |
Merge commit '1cac9accbd1f9b8596122d0735e37b97a844c514'
* commit '1cac9accbd1f9b8596122d0735e37b97a844c514':
avi: properly fail if the dv demuxer is missing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avidec.c')
| -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 c7210f026b..3bdd80bf5d 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -522,7 +522,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); |