Use ffmpeg on OS X.
This commit is contained in:
@@ -5,16 +5,18 @@
|
|||||||
#include "MovieTexture_Null.h"
|
#include "MovieTexture_Null.h"
|
||||||
#include "PrefsManager.h"
|
#include "PrefsManager.h"
|
||||||
|
|
||||||
/* Why is this _WINDOWS and not WIN32?
|
/* _WINDOWS is Windows only, where _WIN32 is Windows and Xbox, I think. Does this
|
||||||
* --steve
|
|
||||||
*
|
|
||||||
* _WINDOWS is Windows only, where _WIN32 is Windows and Xbox, I think. Does this
|
|
||||||
* work on the Xbox? -glenn */
|
* work on the Xbox? -glenn */
|
||||||
#if defined(_WINDOWS)
|
#if defined(_WINDOWS)
|
||||||
#include "MovieTexture_DShow.h"
|
#include "MovieTexture_DShow.h"
|
||||||
#define HAVE_FFMPEG
|
#define HAVE_FFMPEG
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* I don't like this. It should not be here. */
|
||||||
|
#if defined (DARWIN)
|
||||||
|
#define HAVE_FFMPEG
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_FFMPEG
|
#ifdef HAVE_FFMPEG
|
||||||
#include "MovieTexture_FFMpeg.h"
|
#include "MovieTexture_FFMpeg.h"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user