diff options
| author | Matthew Hoops | 2012-09-09 13:47:40 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-09-09 13:47:40 -0400 |
| commit | 4a458236f625d28706cfe4560690770a395ee6e3 (patch) | |
| tree | 556e0ba7d6fbd3b6cc35138f6bf2b873e464d604 /audio | |
| parent | 72a1140d572ce46a820cddb6ac85b748cb7a066d (diff) | |
| download | scummvm-rg350-4a458236f625d28706cfe4560690770a395ee6e3.tar.gz scummvm-rg350-4a458236f625d28706cfe4560690770a395ee6e3.tar.bz2 scummvm-rg350-4a458236f625d28706cfe4560690770a395ee6e3.zip | |
COMMON: Make QuickTimeParser::readSampleDesc take the desc size
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/decoders/quicktime.cpp | 2 | ||||
| -rw-r--r-- | audio/decoders/quicktime_intern.h | 2 | ||||
| -rw-r--r-- | audio/midiparser_qt.cpp | 2 | ||||
| -rw-r--r-- | audio/midiparser_qt.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp index 5276cfc530..3ec90078db 100644 --- a/audio/decoders/quicktime.cpp +++ b/audio/decoders/quicktime.cpp @@ -134,7 +134,7 @@ void QuickTimeAudioDecoder::init() { _audioTracks.push_back(new QuickTimeAudioTrack(this, _tracks[i])); } -Common::QuickTimeParser::SampleDesc *QuickTimeAudioDecoder::readSampleDesc(Track *track, uint32 format) { +Common::QuickTimeParser::SampleDesc *QuickTimeAudioDecoder::readSampleDesc(Track *track, uint32 format, uint32 descSize) { if (track->codecType == CODEC_TYPE_AUDIO) { debug(0, "Audio Codec FourCC: \'%s\'", tag2str(format)); diff --git a/audio/decoders/quicktime_intern.h b/audio/decoders/quicktime_intern.h index efc97cbd13..7e2b0d18d1 100644 --- a/audio/decoders/quicktime_intern.h +++ b/audio/decoders/quicktime_intern.h @@ -131,7 +131,7 @@ protected: }; // Common::QuickTimeParser API - virtual Common::QuickTimeParser::SampleDesc *readSampleDesc(Track *track, uint32 format); + virtual Common::QuickTimeParser::SampleDesc *readSampleDesc(Track *track, uint32 format, uint32 descSize); void init(); diff --git a/audio/midiparser_qt.cpp b/audio/midiparser_qt.cpp index e16c73bfec..65ca64a7f4 100644 --- a/audio/midiparser_qt.cpp +++ b/audio/midiparser_qt.cpp @@ -217,7 +217,7 @@ uint32 MidiParser_QT::readNextEvent(EventInfo &info) { return 0; } -Common::QuickTimeParser::SampleDesc *MidiParser_QT::readSampleDesc(Track *track, uint32 format) { +Common::QuickTimeParser::SampleDesc *MidiParser_QT::readSampleDesc(Track *track, uint32 format, uint32 descSize) { if (track->codecType == CODEC_TYPE_MIDI) { debug(0, "MIDI Codec FourCC '%s'", tag2str(format)); diff --git a/audio/midiparser_qt.h b/audio/midiparser_qt.h index ac5f45ae34..f9378f9c3d 100644 --- a/audio/midiparser_qt.h +++ b/audio/midiparser_qt.h @@ -60,7 +60,7 @@ protected: void parseNextEvent(EventInfo &info); // QuickTimeParser - SampleDesc *readSampleDesc(Track *track, uint32 format); + SampleDesc *readSampleDesc(Track *track, uint32 format, uint32 descSize); private: struct NoteRequestInfo { |