diff options
Diffstat (limited to 'video')
-rw-r--r-- | video/avi_decoder.cpp | 2 | ||||
-rw-r--r-- | video/codecs/indeo3.cpp | 4 | ||||
-rw-r--r-- | video/codecs/indeo3.h | 4 | ||||
-rw-r--r-- | video/coktel_decoder.cpp | 4 |
4 files changed, 0 insertions, 14 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index e3fb2d09ac..9685952304 100644 --- a/video/avi_decoder.cpp +++ b/video/avi_decoder.cpp @@ -399,10 +399,8 @@ Codec *AviDecoder::createCodec() { return new MSRLEDecoder(_bmInfo.width, _bmInfo.height, _bmInfo.bitCount); case ID_CVID: return new CinepakDecoder(_bmInfo.bitCount); -#ifdef USE_INDEO3 case ID_IV32: return new Indeo3Decoder(_bmInfo.width, _bmInfo.height); -#endif #ifdef VIDEO_CODECS_TRUEMOTION1_H case ID_DUCK: return new TrueMotion1Decoder(_bmInfo.width, _bmInfo.height); diff --git a/video/codecs/indeo3.cpp b/video/codecs/indeo3.cpp index 529f0b5bda..7bf7fc8235 100644 --- a/video/codecs/indeo3.cpp +++ b/video/codecs/indeo3.cpp @@ -22,8 +22,6 @@ #include "common/scummsys.h" -#ifdef USE_INDEO3 - /* Intel Indeo 3 decompressor, derived from ffmpeg. * * Original copyright note: * Intel Indeo 3 (IV31, IV32, etc.) video decoder for ffmpeg @@ -3516,5 +3514,3 @@ const uint32 Indeo3Decoder::correctionhighorder[] = { }; } // End of namespace Video - -#endif // USE_INDEO3 diff --git a/video/codecs/indeo3.h b/video/codecs/indeo3.h index c0a88fec5e..a07d779dec 100644 --- a/video/codecs/indeo3.h +++ b/video/codecs/indeo3.h @@ -22,8 +22,6 @@ #include "common/scummsys.h" -#ifdef USE_INDEO3 - /* Intel Indeo 3 decompressor, derived from ffmpeg. * * Original copyright note: @@ -87,5 +85,3 @@ private: } // End of namespace Video #endif // VIDEO_CODECS_INDEO3_H - -#endif // USE_INDEO3 diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp index ee4b22e6b9..8ea2d08acb 100644 --- a/video/coktel_decoder.cpp +++ b/video/coktel_decoder.cpp @@ -1624,11 +1624,7 @@ bool VMDDecoder::openExternalCodec() { if (_videoCodec == kVideoCodecIndeo3) { _isPaletted = false; -#ifdef USE_INDEO3 _codec = new Indeo3Decoder(_width, _height); -#else - warning("VMDDecoder::openExternalCodec(): Indeo3 decoder not compiled in"); -#endif } else { warning("VMDDecoder::openExternalCodec(): Unknown video codec FourCC \"%s\"", |