diff options
| author | Dreammaster | 2013-02-15 08:25:09 -0500 |
|---|---|---|
| committer | Dreammaster | 2013-02-15 08:25:09 -0500 |
| commit | bb3285d933419b6bdefadc55a6e320855ff0dd27 (patch) | |
| tree | 2df613c52f854c33cff660ed1b064e2996ed80bb /audio/decoders/quicktime.cpp | |
| parent | d1a19a1d4c3e20b57250e73141d81e8d9b44a2a1 (diff) | |
| parent | adc338cd719179a94ff470b28e9584262d7b47e8 (diff) | |
| download | scummvm-rg350-bb3285d933419b6bdefadc55a6e320855ff0dd27.tar.gz scummvm-rg350-bb3285d933419b6bdefadc55a6e320855ff0dd27.tar.bz2 scummvm-rg350-bb3285d933419b6bdefadc55a6e320855ff0dd27.zip | |
Merge branch 'master' into hopkins
Diffstat (limited to 'audio/decoders/quicktime.cpp')
| -rw-r--r-- | audio/decoders/quicktime.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp index 0588650ec6..787b547495 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)); |