From b6c340c6dc984aec247ec2695df542fe3ec00ec7 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sat, 6 Sep 2003 11:53:41 +0000 Subject: [PATCH] Use ffmpeg on OS X. --- stepmania/src/arch/MovieTexture/MovieTexture.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/stepmania/src/arch/MovieTexture/MovieTexture.cpp b/stepmania/src/arch/MovieTexture/MovieTexture.cpp index 66740b6870..4946e93652 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture.cpp @@ -5,16 +5,18 @@ #include "MovieTexture_Null.h" #include "PrefsManager.h" -/* Why is this _WINDOWS and not WIN32? - * --steve - * - * _WINDOWS is Windows only, where _WIN32 is Windows and Xbox, I think. Does this +/* _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 #endif +/* I don't like this. It should not be here. */ +#if defined (DARWIN) +#define HAVE_FFMPEG +#endif + #ifdef HAVE_FFMPEG #include "MovieTexture_FFMpeg.h" #endif