mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
Merge commit '1cac9accbd1f9b8596122d0735e37b97a844c514'
* commit '1cac9accbd1f9b8596122d0735e37b97a844c514': avi: properly fail if the dv demuxer is missing Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
c589c4c52d
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user