From 0544977daaf278c041d61a3fbbe959c814e49d6f Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 11 Feb 2011 15:02:15 +0000
Subject: VIDEO: Fix QDM2 audio

A regression from r55474

svn-id: r55882
---
 video/codecs/qdm2.cpp | 2 +-
 video/qt_decoder.cpp  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/video/codecs/qdm2.cpp b/video/codecs/qdm2.cpp
index 8678c94acd..d592548580 100644
--- a/video/codecs/qdm2.cpp
+++ b/video/codecs/qdm2.cpp
@@ -28,7 +28,7 @@
 #include "common/scummsys.h"
 #include "video/codecs/qdm2.h"
 
-#ifdef GRAPHICS_QDM2_H
+#ifdef VIDEO_CODECS_QDM2_H
 
 #include "audio/audiostream.h"
 #include "video/codecs/qdm2data.h"
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 77b2ed7061..6944fd5a77 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -1315,7 +1315,7 @@ bool QuickTimeDecoder::checkAudioCodecSupport(uint32 tag) {
 	if (tag == MKID_BE('twos') || tag == MKID_BE('raw ') || tag == MKID_BE('ima4'))
 		return true;
 
-#ifdef GRAPHICS_QDM2_H
+#ifdef VIDEO_CODECS_QDM2_H
 	if (tag == MKID_BE('QDM2'))
 		return true;
 #endif
@@ -1348,7 +1348,7 @@ Audio::AudioStream *QuickTimeDecoder::createAudioStream(Common::SeekableReadStre
 	} else if (entry->codecTag == MKID_BE('ima4')) {
 		// Riven uses this codec (as do some Myst ME videos)
 		return Audio::makeADPCMStream(stream, DisposeAfterUse::YES, stream->size(), Audio::kADPCMApple, entry->sampleRate, entry->channels, 34);
-#ifdef GRAPHICS_QDM2_H
+#ifdef VIDEO_CODECS_QDM2_H
 	} else if (entry->codecTag == MKID_BE('QDM2')) {
 		// Several Myst ME videos use this codec
 		return makeQDM2Stream(stream, _streams[_audioStreamIndex]->extradata);
-- 
cgit v1.2.3