diff options
| author | Matthew Hoops | 2010-02-05 03:29:04 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-02-05 03:29:04 +0000 |
| commit | 19d3f5ad9b9af7b1f03db35ca97aefef9010acf4 (patch) | |
| tree | 92137f0a6097b3cfcec34e91f9336e7057de0b06 /graphics/video/avi_decoder.cpp | |
| parent | 0d85b3946876f54acd1c6953461780c128f292e3 (diff) | |
| download | scummvm-rg350-19d3f5ad9b9af7b1f03db35ca97aefef9010acf4.tar.gz scummvm-rg350-19d3f5ad9b9af7b1f03db35ca97aefef9010acf4.tar.bz2 scummvm-rg350-19d3f5ad9b9af7b1f03db35ca97aefef9010acf4.zip | |
Have SCI look through the patches directory (except in KQ6 where the patches in that directory are broken) to fix some GK1 Windows problems. Add the MSRLE codec to AVI (from DrMcCoy's Dark Seed II engine, with permission). GK1 Windows now will play the credits video.
svn-id: r47894
Diffstat (limited to 'graphics/video/avi_decoder.cpp')
| -rw-r--r-- | graphics/video/avi_decoder.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/graphics/video/avi_decoder.cpp b/graphics/video/avi_decoder.cpp index cfc48e20e4..037ea6d9bf 100644 --- a/graphics/video/avi_decoder.cpp +++ b/graphics/video/avi_decoder.cpp @@ -37,6 +37,7 @@ // Codecs #include "graphics/video/codecs/msvideo1.h" +#include "graphics/video/codecs/msrle.h" namespace Graphics { @@ -332,7 +333,8 @@ Surface *AviDecoder::getNextFrame() { _audStream->queueBuffer(data, chunkSize, DisposeAfterUse::YES, flags); _fileStream->skip(chunkSize & 1); // Alignment - } else if (getStreamType(nextTag) == 'dc' || getStreamType(nextTag) == 'id' || getStreamType(nextTag) == 'AM') { + } else if (getStreamType(nextTag) == 'dc' || getStreamType(nextTag) == 'id' || + getStreamType(nextTag) == 'AM' || getStreamType(nextTag) == '32') { // Compressed Frame _videoInfo.currentFrame++; uint32 chunkSize = _fileStream->readUint32LE(); @@ -427,6 +429,8 @@ Codec *AviDecoder::createCodec() { case ID_MSVC: case ID_WHAM: return new MSVideo1Decoder(_bmInfo.width, _bmInfo.height, _bmInfo.bitCount); + case ID_RLE : + return new MSRLEDecoder(_bmInfo.width, _bmInfo.height, _bmInfo.bitCount); default: warning ("Unknown/Unhandled compression format \'%s\'", tag2str(_vidsHeader.streamHandler)); } |