diff options
| author | Matthew Hoops | 2011-07-10 15:46:35 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-07-10 15:50:47 -0400 |
| commit | 46aabed3f5bdb3549e3c804793b5198de4b1702c (patch) | |
| tree | d59803c4d48e42edacb28aa62ec7d31390a0c03d /audio/decoders/quicktime.cpp | |
| parent | c46aa548d6d8a1eabb968bfd0152215490bf746c (diff) | |
| download | scummvm-rg350-46aabed3f5bdb3549e3c804793b5198de4b1702c.tar.gz scummvm-rg350-46aabed3f5bdb3549e3c804793b5198de4b1702c.tar.bz2 scummvm-rg350-46aabed3f5bdb3549e3c804793b5198de4b1702c.zip | |
AUDIO: Fix QDM2 sound in QuickTime files
Diffstat (limited to 'audio/decoders/quicktime.cpp')
| -rw-r--r-- | audio/decoders/quicktime.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp index 4531ccee19..a39fedc1d6 100644 --- a/audio/decoders/quicktime.cpp +++ b/audio/decoders/quicktime.cpp @@ -347,11 +347,6 @@ AudioStream *QuickTimeAudioDecoder::AudioSampleDesc::createAudioStream(Common::S } else if (_codecTag == MKTAG('i', 'm', 'a', '4')) { // Riven uses this codec (as do some Myst ME videos) return makeADPCMStream(stream, DisposeAfterUse::YES, stream->size(), kADPCMApple, _sampleRate, _channels, 34); -#ifdef AUDIO_QDM2_H - } else if (_codecTag == MKTAG('Q', 'D', 'M', '2')) { - // Myst ME uses this codec for many videos - return makeQDM2Stream(stream, _parentTrack->extraData); -#endif } error("Unsupported audio codec"); @@ -362,6 +357,11 @@ void QuickTimeAudioDecoder::AudioSampleDesc::initCodec() { delete _codec; _codec = 0; switch (_codecTag) { + case MKTAG('Q', 'D', 'M', '2'): +#ifdef AUDIO_QDM2_H + _codec = makeQDM2Decoder(_parentTrack->extraData); +#endif + break; case MKTAG('m', 'p', '4', 'a'): #ifdef USE_FAAD if (_parentTrack->objectTypeMP4 == 0x40) |