From 866b97845a025cb935a78952317d4c98e698885a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 2 Sep 2003 04:34:02 +0000 Subject: [PATCH] update --- stepmania/src/arch/MovieTexture/MovieTexture.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/stepmania/src/arch/MovieTexture/MovieTexture.cpp b/stepmania/src/arch/MovieTexture/MovieTexture.cpp index 3cdde7dcda..4f277a26b7 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture.cpp @@ -5,11 +5,15 @@ #include "MovieTexture_Null.h" /* Why is this _WINDOWS and not WIN32? - * --steve */ + * --steve + * + * _WINDOWS is Windows only, where _WIN32 is Windows and Xbox, I think. Does this + * work on the Xbox? -glenn */ #if defined(_WINDOWS) #include "MovieTexture_DShow.h" +#define HAVE_FFMPEG #define DEFAULT_MOVIE_DRIVER_LIST "FFMpeg,DShow,Null" -#else +#else /* config.h */ #define DEFAULT_MOVIE_DRIVER_LIST "FFMpeg,Null" #endif @@ -87,7 +91,7 @@ RageMovieTexture *MakeRageMovieTexture(RageTextureID ID) #ifdef _WINDOWS if (!Driver.CompareNoCase("DShow")) ret = new MovieTexture_DShow(ID); #endif -#ifdef HAVE_AVCODEC +#ifdef SUPPORT_MOVIETEXTURE_FFMPEG if (!Driver.CompareNoCase("FFMpeg")) ret = new MovieTexture_FFMpeg(ID); #endif if (!Driver.CompareNoCase("Null")) ret = new MovieTexture_Null(ID);