diff options
| author | Matthew Hoops | 2011-12-11 12:38:06 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 12:28:48 -0500 |
| commit | b367772b5f6966ef99ea0914b8e10644b18652ea (patch) | |
| tree | a17272af1db610d4924d191ca630108afcbf4b8b /audio/decoders/quicktime.cpp | |
| parent | 35a0fb089a12991be52a14e02977202263a7dbee (diff) | |
| download | scummvm-rg350-b367772b5f6966ef99ea0914b8e10644b18652ea.tar.gz scummvm-rg350-b367772b5f6966ef99ea0914b8e10644b18652ea.tar.bz2 scummvm-rg350-b367772b5f6966ef99ea0914b8e10644b18652ea.zip | |
VIDEO: Add support for QuickTime video track edit lists
Diffstat (limited to 'audio/decoders/quicktime.cpp')
| -rw-r--r-- | audio/decoders/quicktime.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp index 8cf0305e88..e737bf8e10 100644 --- a/audio/decoders/quicktime.cpp +++ b/audio/decoders/quicktime.cpp @@ -87,6 +87,9 @@ void QuickTimeAudioDecoder::init() { // Initialize the codec (if necessary) entry->initCodec(); + + if (_tracks[_audioTrackIndex]->editCount != 1) + warning("Multiple edit list entries in an audio track. Things may go awry"); } } } @@ -414,7 +417,9 @@ public: } Timestamp getLength() const { - return Timestamp(0, _tracks[_audioTrackIndex]->duration, _tracks[_audioTrackIndex]->timeScale); + // TODO: Switch to the other one when audio edits are supported + //return Timestamp(0, _tracks[_audioTrackIndex]->duration, _timeScale); + return Timestamp(0, _tracks[_audioTrackIndex]->mediaDuration, _tracks[_audioTrackIndex]->timeScale); } }; |