aboutsummaryrefslogtreecommitdiff
path: root/graphics/video
diff options
context:
space:
mode:
authorSven Hesse2009-07-09 09:39:51 +0000
committerSven Hesse2009-07-09 09:39:51 +0000
commit8a7a81ed30697fea81a22c544543295f65f43835 (patch)
treec7a245d2ac1439c4b426a56b0226636ea1bf6b17 /graphics/video
parent22a48e6c39cdeca154f42027a17efea3794edd82 (diff)
downloadscummvm-rg350-8a7a81ed30697fea81a22c544543295f65f43835.tar.gz
scummvm-rg350-8a7a81ed30697fea81a22c544543295f65f43835.tar.bz2
scummvm-rg350-8a7a81ed30697fea81a22c544543295f65f43835.zip
Warn instead of crash when a video frame part was found although the header says there's no video
svn-id: r42286
Diffstat (limited to 'graphics/video')
-rw-r--r--graphics/video/coktelvideo/coktelvideo.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/graphics/video/coktelvideo/coktelvideo.cpp b/graphics/video/coktelvideo/coktelvideo.cpp
index 8603e125a6..995247acaa 100644
--- a/graphics/video/coktelvideo/coktelvideo.cpp
+++ b/graphics/video/coktelvideo/coktelvideo.cpp
@@ -1324,7 +1324,9 @@ CoktelVideo::State Vmd::processFrame(uint16 frame) {
_stream->skip(part.size);
}
- } else if (part.type == kPartTypeVideo) {
+ } else if ((part.type == kPartTypeVideo) && !_hasVideo) {
+ warning("Header claims there's no video, but video frame part found");
+ } else if ((part.type == kPartTypeVideo) && _hasVideo) {
state.flags &= ~kStateNoVideoData;
uint32 size = part.size;