aboutsummaryrefslogtreecommitdiff
path: root/engines/zvision/video
diff options
context:
space:
mode:
authorFilippos Karapetis2015-01-10 21:32:15 +0200
committerFilippos Karapetis2015-01-10 21:32:15 +0200
commit899cf4813c7e009e1dbee56be8ad10d20650cf10 (patch)
tree32bb9645bdfd07d1bc362704ae1b6c17fd05a6b8 /engines/zvision/video
parent616b34e629686d7bfc3e5a74658c6a76b4a45c94 (diff)
downloadscummvm-rg350-899cf4813c7e009e1dbee56be8ad10d20650cf10.tar.gz
scummvm-rg350-899cf4813c7e009e1dbee56be8ad10d20650cf10.tar.bz2
scummvm-rg350-899cf4813c7e009e1dbee56be8ad10d20650cf10.zip
ZVISION: Change screen resolution for the hires DVD videos to 800x600
Also, this hooks up the MPEG-PS decoder, but only if libmpeg2 is compiled in. The DVD videos are still disabled until AC3 audio support is implemented. The hires DVD videos are encoded a 720x480 resolution, with double the frame rate of the lowres ones (29.97FPS up from 15FPS)
Diffstat (limited to 'engines/zvision/video')
-rw-r--r--engines/zvision/video/video.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index 66a567abb2..d5ffbeb536 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -23,9 +23,7 @@
#include "common/scummsys.h"
#include "common/system.h"
#include "video/video_decoder.h"
-// TODO: Enable once VOB + AC3 support is implemented
-#if 0
-//#ifdef USE_MPEG2
+#ifdef USE_MPEG2
#include "video/mpegps_decoder.h"
#endif
#include "engines/util.h"
@@ -50,9 +48,7 @@ Video::VideoDecoder *ZVision::loadAnimation(const Common::String &fileName) {
animation = new RLFDecoder();
else if (tmpFileName.hasSuffix(".avi"))
animation = new ZorkAVIDecoder();
-// TODO: Enable once VOB + AC3 support is implemented
-#if 0
-//#ifdef USE_MPEG2
+#ifdef USE_MPEG2
else if (tmpFileName.hasSuffix(".vob"))
animation = new Video::MPEGPSDecoder();
#endif