From 18823198ad4e7dedd0ca33760eb453e9fe673551 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 16 Aug 2012 14:00:14 -0400
Subject: VIDEO: Merge AdvancedVideoDecoder into VideoDecoder

---
 video/smk_decoder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'video/smk_decoder.cpp')

diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp
index d707ad519f..d01ec730f4 100644
--- a/video/smk_decoder.cpp
+++ b/video/smk_decoder.cpp
@@ -396,7 +396,7 @@ bool SmackerDecoder::loadStream(Common::SeekableReadStream *stream) {
 }
 
 void SmackerDecoder::close() {
-	AdvancedVideoDecoder::close();
+	VideoDecoder::close();
 
 	delete _fileStream;
 	_fileStream = 0;
@@ -411,7 +411,7 @@ void SmackerDecoder::close() {
 bool SmackerDecoder::rewind() {
 	// Call the parent method to rewind the tracks first
 	// In particular, only videos without sound can be rewound
-	if (!AdvancedVideoDecoder::rewind())
+	if (!VideoDecoder::rewind())
 		return false;
 
 	// And seek back to where the first frame begins
-- 
cgit v1.2.3