aboutsummaryrefslogtreecommitdiff
path: root/video
diff options
context:
space:
mode:
authorrichiesams2013-08-15 14:14:02 -0500
committerrichiesams2013-08-15 14:14:02 -0500
commit95d1ef68ab55920fb45923c974499529268fad67 (patch)
tree4e9609bc1962ac3bf1ea7320f170d865c510104a /video
parent6d5580f4edd3f6a7ef69bb6c05b89cb425f88a1e (diff)
parent435419cfe91eefa3a709af91f2ab172c3cbde022 (diff)
downloadscummvm-rg350-95d1ef68ab55920fb45923c974499529268fad67.tar.gz
scummvm-rg350-95d1ef68ab55920fb45923c974499529268fad67.tar.bz2
scummvm-rg350-95d1ef68ab55920fb45923c974499529268fad67.zip
Merge branch 'master' into zvision
Diffstat (limited to 'video')
-rw-r--r--video/codecs/truemotion1.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/codecs/truemotion1.h b/video/codecs/truemotion1.h
index b2a35cf873..39950b3ea6 100644
--- a/video/codecs/truemotion1.h
+++ b/video/codecs/truemotion1.h
@@ -23,7 +23,7 @@
// Based on the TrueMotion 1 decoder by Alex Beregszaszi & Mike Melanson in FFmpeg
// Only compile if SCI32 is enabled or if we're building dynamic modules
-#if defined(ENABLE_SCI32) || defined(DYNAMIC_MODULES)
+//#if defined(ENABLE_SCI32) || defined(DYNAMIC_MODULES)
#ifndef VIDEO_CODECS_TRUEMOTION1_H
#define VIDEO_CODECS_TRUEMOTION1_H
@@ -106,4 +106,4 @@ private:
} // End of namespace Video
#endif // VIDEO_CODECS_TRUEMOTION1_H
-#endif // SCI32/Plugins guard
+//#endif // SCI32/Plugins guard