8 files changed, 14 insertions, 14 deletions
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 7dab38b500..de35b8122c 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -77,8 +77,8 @@ MoviePlayer::MoviePlayer(SwordEngine *vm, Text *textMan, Audio::Mixer *snd, OSys
 }
 
 MoviePlayer::~MoviePlayer() {
-	delete _decoder;
 	delete _bgSoundHandle;
+	delete _decoder;
 }
 
 /**
@@ -318,7 +318,7 @@ uint32 DXADecoderWithSound::getElapsedTime() const {
 	if (_mixer->isSoundHandleActive(*_bgSoundHandle))
 		return _mixer->getSoundElapsedTime(*_bgSoundHandle);
 
-	return VideoDecoder::getElapsedTime();
+	return DXADecoder::getElapsedTime();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index dd06456656..3c506c0dae 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -56,7 +56,7 @@ MoviePlayer::MoviePlayer(Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, A
 	_black = 0;
 }
 
-MoviePlayer:: ~MoviePlayer() {
+MoviePlayer::~MoviePlayer() {
 	delete _bgSoundHandle;
 	delete _decoder;
 }
@@ -345,7 +345,7 @@ uint32 DXADecoderWithSound::getElapsedTime() const {
 	if (_mixer->isSoundHandleActive(*_bgSoundHandle))
 		return _mixer->getSoundElapsedTime(*_bgSoundHandle);
 
-	return VideoDecoder::getElapsedTime();
+	return DXADecoder::getElapsedTime();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp
index b1747fd71a..b72542f95a 100644
--- a/engines/sword25/fmv/theora_decoder.cpp
+++ b/engines/sword25/fmv/theora_decoder.cpp
@@ -456,7 +456,7 @@ const Graphics::Surface *TheoraDecoder::decodeNextFrame() {
 }
 
 void TheoraDecoder::reset() {
-	VideoDecoder::reset();
+	FixedRateVideoDecoder::reset();
 
 	if (_fileStream)
 		_fileStream->seek(0);
@@ -488,7 +488,7 @@ uint32 TheoraDecoder::getElapsedTime() const {
 	if (_audStream && _mixer)
 		return _mixer->getSoundElapsedTime(*_audHandle);
 
-	return VideoDecoder::getElapsedTime();
+	return FixedRateVideoDecoder::getElapsedTime();
 }
 
 Audio::QueuingAudioStream *TheoraDecoder::createAudioStream() {
diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h
index e89c394946..5e2675b629 100644
--- a/engines/sword25/fmv/theora_decoder.h
+++ b/engines/sword25/fmv/theora_decoder.h
@@ -75,7 +75,7 @@ public:
 		return _fileStream != 0;
 	}
 	bool isPaused() const {
-		return (VideoDecoder::isPaused() || !isVideoLoaded());
+		return (FixedRateVideoDecoder::isPaused() || !isVideoLoaded());
 	}
 
 	uint16 getWidth() const {
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) {