diff options
| author | Matthew Hoops | 2011-02-11 15:02:15 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2011-02-11 15:02:15 +0000 |
| commit | 0544977daaf278c041d61a3fbbe959c814e49d6f (patch) | |
| tree | 86e0dfbf965d9add4ac963ae37b5eda27cecd0d2 | |
| parent | fffb8f5617f175d0b947c65d75f3d938b61e0555 (diff) | |
| download | scummvm-rg350-0544977daaf278c041d61a3fbbe959c814e49d6f.tar.gz scummvm-rg350-0544977daaf278c041d61a3fbbe959c814e49d6f.tar.bz2 scummvm-rg350-0544977daaf278c041d61a3fbbe959c814e49d6f.zip | |
VIDEO: Fix QDM2 audio
A regression from r55474
svn-id: r55882
| -rw-r--r-- | video/codecs/qdm2.cpp | 2 | ||||
| -rw-r--r-- | 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); |