4 files changed, 7 insertions, 7 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 {