diff options
author | Matthew Hoops | 2014-03-18 19:11:53 -0400 |
---|---|---|
committer | Matthew Hoops | 2014-03-18 19:12:20 -0400 |
commit | 963075386118ac0da1404192d4c8ee4a51813cd7 (patch) | |
tree | 0c8c63fe3f27bc62c4b7418b70c4ce22a34905ce /audio/decoders/quicktime.cpp | |
parent | f4e7b593dc9d841640bda26da59de716772b4411 (diff) | |
download | scummvm-rg350-963075386118ac0da1404192d4c8ee4a51813cd7.tar.gz scummvm-rg350-963075386118ac0da1404192d4c8ee4a51813cd7.tar.bz2 scummvm-rg350-963075386118ac0da1404192d4c8ee4a51813cd7.zip |
COMMON: Move some QuickTime Track variables into SampleDesc where they belong
Diffstat (limited to 'audio/decoders/quicktime.cpp')
-rw-r--r-- | audio/decoders/quicktime.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp index 787b547495..547abd2aa4 100644 --- a/audio/decoders/quicktime.cpp +++ b/audio/decoders/quicktime.cpp @@ -585,7 +585,7 @@ bool QuickTimeAudioDecoder::AudioSampleDesc::isAudioCodecSupported() const { if (_codecTag == MKTAG('m', 'p', '4', 'a')) { Common::String audioType; - switch (_parentTrack->objectTypeMP4) { + switch (_objectTypeMP4) { case 0x40: // AAC #ifdef USE_FAAD return true; @@ -643,13 +643,13 @@ void QuickTimeAudioDecoder::AudioSampleDesc::initCodec() { switch (_codecTag) { case MKTAG('Q', 'D', 'M', '2'): #ifdef AUDIO_QDM2_H - _codec = makeQDM2Decoder(_parentTrack->extraData); + _codec = makeQDM2Decoder(_extraData); #endif break; case MKTAG('m', 'p', '4', 'a'): #ifdef USE_FAAD - if (_parentTrack->objectTypeMP4 == 0x40) - _codec = makeAACDecoder(_parentTrack->extraData); + if (_objectTypeMP4 == 0x40) + _codec = makeAACDecoder(_extraData); #endif break; default: |