diff options
| author | Alejandro Marzini | 2010-08-16 00:21:07 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-08-16 00:21:07 +0000 |
| commit | b0409d673921163085d2e2fa440911080a7cf884 (patch) | |
| tree | 81b1bb895db6baed7881ca5cbc7ff3a830286189 /graphics/video/avi_decoder.cpp | |
| parent | 503578ac1087b91dcb912fd7918454de73538b34 (diff) | |
| parent | b49761b6eae3a0aadefef4c4ffee6a7b583cc3ac (diff) | |
| download | scummvm-rg350-b0409d673921163085d2e2fa440911080a7cf884.tar.gz scummvm-rg350-b0409d673921163085d2e2fa440911080a7cf884.tar.bz2 scummvm-rg350-b0409d673921163085d2e2fa440911080a7cf884.zip | |
Merge trunk, from r51777 to r52105
svn-id: r52108
Diffstat (limited to 'graphics/video/avi_decoder.cpp')
| -rw-r--r-- | graphics/video/avi_decoder.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/graphics/video/avi_decoder.cpp b/graphics/video/avi_decoder.cpp index 06589d99b0..4973cb3eb0 100644 --- a/graphics/video/avi_decoder.cpp +++ b/graphics/video/avi_decoder.cpp @@ -38,6 +38,7 @@ #include "graphics/video/codecs/cinepak.h" #include "graphics/video/codecs/msvideo1.h" #include "graphics/video/codecs/msrle.h" +#include "graphics/video/codecs/indeo3.h" namespace Graphics { @@ -387,10 +388,14 @@ Codec *AviDecoder::createCodec() { case ID_MSVC: case ID_WHAM: return new MSVideo1Decoder(_bmInfo.width, _bmInfo.height, _bmInfo.bitCount); - case ID_RLE : + case ID_RLE: return new MSRLEDecoder(_bmInfo.width, _bmInfo.height, _bmInfo.bitCount); case ID_CVID: return new CinepakDecoder(); +#ifdef USE_INDEO3 + case ID_IV32: + return new Indeo3Decoder(_bmInfo.width, _bmInfo.height); +#endif default: warning ("Unknown/Unhandled compression format \'%s\'", tag2str(_vidsHeader.streamHandler)); } |