diff options
| author | clone2727 | 2012-12-13 15:49:40 -0800 |
|---|---|---|
| committer | clone2727 | 2012-12-13 15:49:40 -0800 |
| commit | 91317c3630f9bff164d8c747ef886b52a85e3a9b (patch) | |
| tree | bb66e8e1acf7bd9315dc7307184b77209adb8d51 /video/qt_decoder.cpp | |
| parent | a0863dfb3f3998f34c591f3007efe9f9f0f7f311 (diff) | |
| parent | 17f923532533c8a094e1bf0a0efa7369b20ef48a (diff) | |
| download | scummvm-rg350-91317c3630f9bff164d8c747ef886b52a85e3a9b.tar.gz scummvm-rg350-91317c3630f9bff164d8c747ef886b52a85e3a9b.tar.bz2 scummvm-rg350-91317c3630f9bff164d8c747ef886b52a85e3a9b.zip | |
Merge pull request #293 from clone2727/qtmidi
Add support for QuickTime Music playback
Diffstat (limited to 'video/qt_decoder.cpp')
| -rw-r--r-- | video/qt_decoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp index c5fcab4b49..93e57f96ea 100644 --- a/video/qt_decoder.cpp +++ b/video/qt_decoder.cpp @@ -110,7 +110,7 @@ const Graphics::Surface *QuickTimeDecoder::decodeNextFrame() { return frame; } -Common::QuickTimeParser::SampleDesc *QuickTimeDecoder::readSampleDesc(Common::QuickTimeParser::Track *track, uint32 format) { +Common::QuickTimeParser::SampleDesc *QuickTimeDecoder::readSampleDesc(Common::QuickTimeParser::Track *track, uint32 format, uint32 descSize) { if (track->codecType == CODEC_TYPE_VIDEO) { debug(0, "Video Codec FourCC: \'%s\'", tag2str(format)); @@ -205,7 +205,7 @@ Common::QuickTimeParser::SampleDesc *QuickTimeDecoder::readSampleDesc(Common::Qu } // Pass it on up - return Audio::QuickTimeAudioDecoder::readSampleDesc(track, format); + return Audio::QuickTimeAudioDecoder::readSampleDesc(track, format, descSize); } void QuickTimeDecoder::init() { |