aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2009-11-27 19:26:20 +0000
committerSven Hesse2009-11-27 19:26:20 +0000
commitc8b8ab679fac5907222b33269fc2ee75ffd9aca9 (patch)
treebb1c389e4c865f9cc29c9fecce8dfdc5c78aa885
parentcb2cc67b41be25e78ef3abff540617d46a7c906a (diff)
downloadscummvm-rg350-c8b8ab679fac5907222b33269fc2ee75ffd9aca9.tar.gz
scummvm-rg350-c8b8ab679fac5907222b33269fc2ee75ffd9aca9.tar.bz2
scummvm-rg350-c8b8ab679fac5907222b33269fc2ee75ffd9aca9.zip
00AM is another compressed frame type, fixing this (thanks to digitall for figuring that out :D)
svn-id: r46163
-rw-r--r--graphics/video/avi_decoder.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/graphics/video/avi_decoder.cpp b/graphics/video/avi_decoder.cpp
index 06a3ead505..4d728bdbb8 100644
--- a/graphics/video/avi_decoder.cpp
+++ b/graphics/video/avi_decoder.cpp
@@ -313,7 +313,7 @@ Surface *AviDecoder::getNextFrame() {
_fileStream->read(data, chunkSize);
_audStream->queueBuffer(data, chunkSize);
_fileStream->skip(chunkSize & 1); // Alignment
- } else if (getStreamType(nextTag) == 'dc' || getStreamType(nextTag) == 'id') {
+ } else if (getStreamType(nextTag) == 'dc' || getStreamType(nextTag) == 'id' || getStreamType(nextTag) == 'AM') {
// Compressed Frame
_videoInfo.currentFrame++;
uint32 chunkSize = _fileStream->readUint32LE();
@@ -349,8 +349,6 @@ Surface *AviDecoder::getNextFrame() {
// No alignment necessary. It's always even.
} else if (nextTag == ID_JUNK) {
runHandle(ID_JUNK);
- } else if (nextTag == ID_00AM) {
- runHandle(ID_JUNK);
} else if (nextTag == ID_IDX1) {
runHandle(ID_IDX1);
} else