diff options
| author | Sven Hesse | 2010-08-08 00:33:13 +0000 |
|---|---|---|
| committer | Sven Hesse | 2010-08-08 00:33:13 +0000 |
| commit | b5b47d50c8984361965c49eead999eb7bc672171 (patch) | |
| tree | 542c5b2793fadad357b5c54360043133295f2848 /graphics/video/avi_decoder.cpp | |
| parent | d365b71945c8d31fd19b4de638cc26db617fd5a5 (diff) | |
| download | scummvm-rg350-b5b47d50c8984361965c49eead999eb7bc672171.tar.gz scummvm-rg350-b5b47d50c8984361965c49eead999eb7bc672171.tar.bz2 scummvm-rg350-b5b47d50c8984361965c49eead999eb7bc672171.zip | |
VIDEO: Make Indeo3 a proper video codec
This way, Indeo3 is properly usable in various container VideoDecoder,
for example AVI, and not just VMD.
Since VMD is not yet ready for this, we're disabling Indeo3 in VMDs
for now.
svn-id: r51849
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)); } |