aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure23
-rw-r--r--devtools/create_project/create_project.cpp1
-rw-r--r--video/avi_decoder.cpp2
-rw-r--r--video/codecs/indeo3.cpp4
-rw-r--r--video/codecs/indeo3.h4
-rw-r--r--video/coktel_decoder.cpp4
6 files changed, 0 insertions, 38 deletions
diff --git a/configure b/configure
index a2542dac93..a86bff7734 100755
--- a/configure
+++ b/configure
@@ -145,7 +145,6 @@ _text_console=no
_mt32emu=yes
_build_scalers=yes
_build_hq_scalers=yes
-_indeo3=auto
_enable_prof=no
_posix=no
_global_constructors=no
@@ -746,8 +745,6 @@ Optional Libraries:
--with-opengl-prefix=DIR Prefix where OpenGL (ES) is installed (optional)
--disable-opengl disable OpenGL (ES) support [autodetect]
- --disable-indeo3 disable Indeo3 decoder [autodetect]
-
--with-png-prefix=DIR Prefix where libpng is installed (optional)
--disable-png disable PNG decoder [autodetect]
@@ -806,8 +803,6 @@ for ac_option in $@; do
--enable-nasm) _nasm=yes ;;
--disable-nasm) _nasm=no ;;
--enable-mpeg2) _mpeg2=yes ;;
- --disable-indeo3) _indeo3=no ;;
- --enable-indeo3) _indeo3=yes ;;
--disable-png) _png=no ;;
--enable-png) _png=yes ;;
--disable-theoradec) _theoradec=no ;;
@@ -1935,7 +1930,6 @@ if test -n "$_host"; then
_backend="n64"
_mt32emu=no
_build_scalers=no
- _indeo3=no
_translation=no
_keymapper=no
_text_console=no
@@ -2538,19 +2532,6 @@ define_in_config_if_yes "$_build_scalers" 'USE_SCALERS'
define_in_config_if_yes "$_build_hq_scalers" 'USE_HQ_SCALERS'
#
-# Check whether to compile the Indeo3 decoder
-#
-if test "$_indeo3" = auto ; then
- # Autodetect. Build if either the gob engine or plugins are enabled
- if test `get_engine_build gob` = yes || test "$_dynamic_modules" = yes ; then
- _indeo3=yes
- else
- _indeo3=no
- fi
-fi
-define_in_config_if_yes "$_indeo3" 'USE_INDEO3'
-
-#
# Check for math lib
#
cat > $TMPC << EOF
@@ -3157,10 +3138,6 @@ if test "$_mt32emu" = yes ; then
echo_n ", MT-32 emu"
fi
-if test "$_indeo3" = yes ; then
- echo_n ", Indeo3 decoder"
-fi
-
if test "$_text_console" = yes ; then
echo_n ", text console"
fi
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index b75b22a290..fd28882e3d 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -738,7 +738,6 @@ const Feature s_features[] = {
{ "mt32emu", "USE_MT32EMU", "", true, "integrated MT-32 emulator" },
{ "nasm", "USE_NASM", "", true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling.
{ "opengl", "USE_OPENGL", "opengl32", true, "OpenGL support" },
- { "indeo3", "USE_INDEO3", "", true, "Indeo3 codec support"},
{ "translation", "USE_TRANSLATION", "", true, "Translation support" },
{ "vkeybd", "ENABLE_VKEYBD", "", false, "Virtual keyboard support"},
{ "langdetect", "USE_DETECTLANG", "", true, "System language detection support" } // This feature actually depends on "translation", there
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\"",