aboutsummaryrefslogtreecommitdiff
path: root/video
diff options
context:
space:
mode:
Diffstat (limited to 'video')
-rw-r--r--video/avi_decoder.cpp2
-rw-r--r--video/flic_decoder.cpp2
-rw-r--r--video/qt_decoder.cpp8
-rw-r--r--video/smk_decoder.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index 87072410db..1e2515680f 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -313,7 +313,7 @@ uint32 AviDecoder::getElapsedTime() const {
if (_audStream)
return _mixer->getSoundElapsedTime(*_audHandle);
- return VideoDecoder::getElapsedTime();
+ return FixedRateVideoDecoder::getElapsedTime();
}
const Graphics::Surface *AviDecoder::decodeNextFrame() {
diff --git a/video/flic_decoder.cpp b/video/flic_decoder.cpp
index 3afeef2874..90f7a8e9ac 100644
--- a/video/flic_decoder.cpp
+++ b/video/flic_decoder.cpp
@@ -280,7 +280,7 @@ const Graphics::Surface *FlicDecoder::decodeNextFrame() {
}
void FlicDecoder::reset() {
- VideoDecoder::reset();
+ FixedRateVideoDecoder::reset();
if (_fileStream)
_fileStream->seek(_offsetFrame1);
}
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index c9fcc7a9bf..379dc5d7a2 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -59,7 +59,7 @@ namespace Video {
// QuickTimeDecoder
////////////////////////////////////////////
-QuickTimeDecoder::QuickTimeDecoder() : VideoDecoder() {
+QuickTimeDecoder::QuickTimeDecoder() {
_audStream = NULL;
_beginOffset = 0;
_curFrame = -1;
@@ -387,14 +387,14 @@ const Graphics::Surface *QuickTimeDecoder::scaleSurface(const Graphics::Surface
}
bool QuickTimeDecoder::endOfVideo() const {
- return (!_audStream || _audStream->endOfData()) && (!findDefaultVideoCodec() || VideoDecoder::endOfVideo());
+ return (!_audStream || _audStream->endOfData()) && (!findDefaultVideoCodec() || SeekableVideoDecoder::endOfVideo());
}
uint32 QuickTimeDecoder::getElapsedTime() const {
if (_audStream)
return g_system->getMixer()->getSoundElapsedTime(_audHandle) + _audioStartOffset.msecs();
- return VideoDecoder::getElapsedTime();
+ return SeekableVideoDecoder::getElapsedTime();
}
uint32 QuickTimeDecoder::getTimeToNextFrame() const {
@@ -1253,7 +1253,7 @@ void QuickTimeDecoder::close() {
// The audio stream is deleted automatically
_audStream = NULL;
- VideoDecoder::reset();
+ SeekableVideoDecoder::reset();
}
Common::SeekableReadStream *QuickTimeDecoder::getNextFramePacket(uint32 &descId) {
diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp
index 15f2b93948..d7412e99c3 100644
--- a/video/smk_decoder.cpp
+++ b/video/smk_decoder.cpp
@@ -367,7 +367,7 @@ uint32 SmackerDecoder::getElapsedTime() const {
if (_audioStream && _audioStarted)
return _mixer->getSoundElapsedTime(_audioHandle);
- return VideoDecoder::getElapsedTime();
+ return FixedRateVideoDecoder::getElapsedTime();
}
bool SmackerDecoder::loadStream(Common::SeekableReadStream *stream) {