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/smk_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/smk_decoder.cpp')
| -rw-r--r-- | video/smk_decoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |