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 /video | |
| 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 'video')
| -rw-r--r-- | video/qt_decoder.cpp | 4 | ||||
| -rw-r--r-- | video/qt_decoder.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp index b4dab9ddfb..a105a96853 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() { diff --git a/video/qt_decoder.h b/video/qt_decoder.h index 71d33711a6..b973a367d3 100644 --- a/video/qt_decoder.h +++ b/video/qt_decoder.h @@ -69,7 +69,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(); |
