diff options
| author | Thierry Crozat | 2018-10-31 21:37:56 +0000 |
|---|---|---|
| committer | Thierry Crozat | 2018-11-04 22:33:22 +0100 |
| commit | e2935acfe4a6d332f7b1388fa98fce711cde8c12 (patch) | |
| tree | 9f1ef23eeb0903fdffc44c15034cbc2c70257d53 /engines/zvision/video/video.cpp | |
| parent | 71910c2283532a2071aed725835c66afee451e2d (diff) | |
| download | scummvm-rg350-e2935acfe4a6d332f7b1388fa98fce711cde8c12.tar.gz scummvm-rg350-e2935acfe4a6d332f7b1388fa98fce711cde8c12.tar.bz2 scummvm-rg350-e2935acfe4a6d332f7b1388fa98fce711cde8c12.zip | |
ZVISION: Disable MPEG movies when liba52 is not enabled
Diffstat (limited to 'engines/zvision/video/video.cpp')
| -rw-r--r-- | engines/zvision/video/video.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp index 0c19c92574..01e75a4a3d 100644 --- a/engines/zvision/video/video.cpp +++ b/engines/zvision/video/video.cpp @@ -23,7 +23,7 @@ #include "common/scummsys.h" #include "common/system.h" #include "video/video_decoder.h" -#ifdef USE_MPEG2 +#if defined(USE_MPEG2) && defined(USE_A52) #include "video/mpegps_decoder.h" #endif #include "engines/util.h" @@ -48,7 +48,7 @@ Video::VideoDecoder *ZVision::loadAnimation(const Common::String &fileName) { animation = new RLFDecoder(); else if (tmpFileName.hasSuffix(".avi")) animation = new ZorkAVIDecoder(); -#ifdef USE_MPEG2 +#if defined(USE_MPEG2) && defined(USE_A52) else if (tmpFileName.hasSuffix(".vob")) animation = new Video::MPEGPSDecoder(); #endif |