aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/video.h
diff options
context:
space:
mode:
authorMatthew Hoops2012-08-16 14:00:14 -0400
committerMatthew Hoops2012-08-16 14:00:14 -0400
commit18823198ad4e7dedd0ca33760eb453e9fe673551 (patch)
tree6a4ef578a74c5ffd616101f686a2f3b7248406d4 /engines/mohawk/video.h
parent7569ec7dc00e95e0643cde7f413a7cf46a4770f0 (diff)
downloadscummvm-rg350-18823198ad4e7dedd0ca33760eb453e9fe673551.tar.gz
scummvm-rg350-18823198ad4e7dedd0ca33760eb453e9fe673551.tar.bz2
scummvm-rg350-18823198ad4e7dedd0ca33760eb453e9fe673551.zip
VIDEO: Merge AdvancedVideoDecoder into VideoDecoder
Diffstat (limited to 'engines/mohawk/video.h')
-rw-r--r--engines/mohawk/video.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h
index 4e34604bfd..9dddcde09b 100644
--- a/engines/mohawk/video.h
+++ b/engines/mohawk/video.h
@@ -45,7 +45,7 @@ struct MLSTRecord {
struct VideoEntry {
// Playback variables
- Video::AdvancedVideoDecoder *video;
+ Video::VideoDecoder *video;
uint16 x;
uint16 y;
bool loop;
@@ -57,7 +57,7 @@ struct VideoEntry {
int id; // Internal Mohawk files
// Helper functions
- Video::AdvancedVideoDecoder *operator->() const { assert(video); return video; } // TODO: Remove this eventually
+ Video::VideoDecoder *operator->() const { assert(video); return video; } // TODO: Remove this eventually
void clear();
bool endOfVideo();
};