aboutsummaryrefslogtreecommitdiff
path: root/base/version.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2011-06-03 01:14:16 -0400
committerMatthew Hoops2011-06-03 01:14:16 -0400
commit224c71e483e09931ba386555ff3b436b9defe63d (patch)
tree8e6178331a7bbd3ee1be318d3fc7a7c7f478468f /base/version.cpp
parentd4c92983920cfe3b25a22d91e12c750e591b917e (diff)
parent547fd1bdcabcba0e741eb31100ba99ff73399d24 (diff)
downloadscummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.gz
scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.bz2
scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.zip
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'base/version.cpp')
-rw-r--r--base/version.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/base/version.cpp b/base/version.cpp
index 6a670c1a40..3083034714 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -112,5 +112,9 @@ const char *gScummVMFeatures = ""
#ifdef USE_THEORADEC
"Theora "
#endif
+
+#ifdef USE_FAAD
+ "AAC "
+#endif
;