virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
Code Issues Releases Activity

Merge commit '1cac9accbd1f9b8596122d0735e37b97a844c514'

Browse Source 
* commit '1cac9accbd1f9b8596122d0735e37b97a844c514':
  avi: properly fail if the dv demuxer is missing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-10 10:38:46 +02:00
commit c589c4c52d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/avidec.c
View File

@ -522,7 +522,8 @@ static int avi_read_header(AVFormatContext *s)
avi->dv_demux = avpriv_dv_init_demux(s); avi->dv_demux = avpriv_dv_init_demux(s);
if (!avi->dv_demux) if (!avi->dv_demux)
goto fail; goto fail;
} } else
goto fail;
s->streams[0]->priv_data = ast; s->streams[0]->priv_data = ast;
avio_skip(pb, 3 * 4); avio_skip(pb, 3 * 4);
ast->scale = avio_rl32(pb); ast->scale = avio_rl32(pb);