diff options
| author | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-07-13 14:39:18 +0000 |
|---|---|---|
| committer | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-07-13 14:39:18 +0000 |
| commit | e3d05e9971f910559480d3c13389aece3948b164 (patch) | |
| tree | caefff804e4fa9c31f98ec0f8eb248cbc8cb719f /libmpdemux | |
| parent | 338f0e6a1fd0a5ead5e2e9b3bdf828de278cac5e (diff) | |
| download | mpv-e3d05e9971f910559480d3c13389aece3948b164.tar.bz2 mpv-e3d05e9971f910559480d3c13389aece3948b164.tar.xz | |
Fix segfault if an 'strf' chunk couldn't be found in avi
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23772 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/video.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 6f42afb189..554b7ac735 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -85,6 +85,9 @@ switch(video_codec){ case VIDEO_OTHER: { if((d_video->demuxer->file_format == DEMUXER_TYPE_ASF) || (d_video->demuxer->file_format == DEMUXER_TYPE_AVI)) { // display info: + // in case no strf chunk has been seen in avi, we have no bitmap header + if(!sh_video->bih) return 0; + sh_video->format=sh_video->bih->biCompression; sh_video->disp_w=sh_video->bih->biWidth; |