aboutsummaryrefslogtreecommitdiff
path: root/video/qt_decoder.h
diff options
context:
space:
mode:
authorclone27272012-12-13 15:49:40 -0800
committerclone27272012-12-13 15:49:40 -0800
commit91317c3630f9bff164d8c747ef886b52a85e3a9b (patch)
treebb66e8e1acf7bd9315dc7307184b77209adb8d51 /video/qt_decoder.h
parenta0863dfb3f3998f34c591f3007efe9f9f0f7f311 (diff)
parent17f923532533c8a094e1bf0a0efa7369b20ef48a (diff)
downloadscummvm-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.h')
-rw-r--r--video/qt_decoder.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index 45ab155c2c..135da91f88 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -70,7 +70,7 @@ public:
Audio::Timestamp getDuration() const { return Audio::Timestamp(0, _duration, _timeScale); }
protected:
- Common::QuickTimeParser::SampleDesc *readSampleDesc(Common::QuickTimeParser::Track *track, uint32 format);
+ Common::QuickTimeParser::SampleDesc *readSampleDesc(Common::QuickTimeParser::Track *track, uint32 format, uint32 descSize);
private:
void init();