aboutsummaryrefslogtreecommitdiff
path: root/graphics/video/avi_decoder.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2010-05-23 18:33:55 +0000
committerMatthew Hoops2010-05-23 18:33:55 +0000
commit2f31b05651baf87ea07bc00cced798955a5fa6be (patch)
treeeedade6bd746422fe45e8c48c76d1dd667a45b20 /graphics/video/avi_decoder.cpp
parente2a388e2f59f689cd89995013236e90a1b004264 (diff)
downloadscummvm-rg350-2f31b05651baf87ea07bc00cced798955a5fa6be.tar.gz
scummvm-rg350-2f31b05651baf87ea07bc00cced798955a5fa6be.tar.bz2
scummvm-rg350-2f31b05651baf87ea07bc00cced798955a5fa6be.zip
Move Mohawk's QuickTime code to graphics/ (and QDM2 to sound, disabled when Mohawk is not enabled) so SCI can use the code.
svn-id: r49165
Diffstat (limited to 'graphics/video/avi_decoder.cpp')
-rw-r--r--graphics/video/avi_decoder.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/graphics/video/avi_decoder.cpp b/graphics/video/avi_decoder.cpp
index 944c9700bd..f19ca4aa28 100644
--- a/graphics/video/avi_decoder.cpp
+++ b/graphics/video/avi_decoder.cpp
@@ -35,6 +35,7 @@
#include "graphics/video/avi_decoder.h"
// Codecs
+#include "graphics/video/codecs/cinepak.h"
#include "graphics/video/codecs/msvideo1.h"
#include "graphics/video/codecs/msrle.h"
@@ -379,6 +380,8 @@ Codec *AviDecoder::createCodec() {
return new MSVideo1Decoder(_bmInfo.width, _bmInfo.height, _bmInfo.bitCount);
case ID_RLE :
return new MSRLEDecoder(_bmInfo.width, _bmInfo.height, _bmInfo.bitCount);
+ case ID_CVID:
+ return new CinepakDecoder();
default:
warning ("Unknown/Unhandled compression format \'%s\'", tag2str(_vidsHeader.streamHandler));
}