diff options
author | Matthew Hoops | 2012-08-16 14:00:14 -0400 |
---|---|---|
committer | Matthew Hoops | 2012-08-16 14:00:14 -0400 |
commit | 18823198ad4e7dedd0ca33760eb453e9fe673551 (patch) | |
tree | 6a4ef578a74c5ffd616101f686a2f3b7248406d4 /video/qt_decoder.cpp | |
parent | 7569ec7dc00e95e0643cde7f413a7cf46a4770f0 (diff) | |
download | scummvm-rg350-18823198ad4e7dedd0ca33760eb453e9fe673551.tar.gz scummvm-rg350-18823198ad4e7dedd0ca33760eb453e9fe673551.tar.bz2 scummvm-rg350-18823198ad4e7dedd0ca33760eb453e9fe673551.zip |
VIDEO: Merge AdvancedVideoDecoder into VideoDecoder
Diffstat (limited to 'video/qt_decoder.cpp')
-rw-r--r-- | video/qt_decoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp index 70dcdff9c6..87c530dba0 100644 --- a/video/qt_decoder.cpp +++ b/video/qt_decoder.cpp @@ -79,7 +79,7 @@ bool QuickTimeDecoder::loadStream(Common::SeekableReadStream *stream) { } void QuickTimeDecoder::close() { - AdvancedVideoDecoder::close(); + VideoDecoder::close(); Common::QuickTimeParser::close(); if (_scaledSurface) { @@ -90,7 +90,7 @@ void QuickTimeDecoder::close() { } const Graphics::Surface *QuickTimeDecoder::decodeNextFrame() { - const Graphics::Surface *frame = AdvancedVideoDecoder::decodeNextFrame(); + const Graphics::Surface *frame = VideoDecoder::decodeNextFrame(); // Update audio buffers too // (needs to be done after we find the next track) @@ -244,7 +244,7 @@ void QuickTimeDecoder::init() { void QuickTimeDecoder::updateAudioBuffer() { // Updates the audio buffers for all audio tracks for (TrackListIterator it = getTrackListBegin(); it != getTrackListEnd(); it++) - if ((*it)->getTrackType() == AdvancedVideoDecoder::Track::kTrackTypeAudio) + if ((*it)->getTrackType() == VideoDecoder::Track::kTrackTypeAudio) ((AudioTrackHandler *)*it)->updateBuffer(); } |