aboutsummaryrefslogtreecommitdiff
path: root/video/psx_decoder.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2012-08-16 14:00:14 -0400
committerMatthew Hoops2012-08-16 14:00:14 -0400
commit18823198ad4e7dedd0ca33760eb453e9fe673551 (patch)
tree6a4ef578a74c5ffd616101f686a2f3b7248406d4 /video/psx_decoder.cpp
parent7569ec7dc00e95e0643cde7f413a7cf46a4770f0 (diff)
downloadscummvm-rg350-18823198ad4e7dedd0ca33760eb453e9fe673551.tar.gz
scummvm-rg350-18823198ad4e7dedd0ca33760eb453e9fe673551.tar.bz2
scummvm-rg350-18823198ad4e7dedd0ca33760eb453e9fe673551.zip
VIDEO: Merge AdvancedVideoDecoder into VideoDecoder
Diffstat (limited to 'video/psx_decoder.cpp')
-rw-r--r--video/psx_decoder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/psx_decoder.cpp b/video/psx_decoder.cpp
index 93bf711c25..fa7f1e8cfe 100644
--- a/video/psx_decoder.cpp
+++ b/video/psx_decoder.cpp
@@ -174,7 +174,7 @@ bool PSXStreamDecoder::loadStream(Common::SeekableReadStream *stream) {
}
void PSXStreamDecoder::close() {
- AdvancedVideoDecoder::close();
+ VideoDecoder::close();
_audioTrack = 0;
_videoTrack = 0;
_frameCount = 0;