summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-08-27 09:17:03 +0000
committerDiego Biurrun <diego@biurrun.de>2007-08-27 09:17:03 +0000
commitc97f54020d5d55511e28622551f13233bd8ceb56 (patch)
tree803e1d80d7073edddbcb66832074fb72032d7361 /ffplay.c
parentd664a6255bd5f554068372a7caf732955b27eeb8 (diff)
Change SYS_DARWIN preprocessor checks to __APPLE__, they are specific
to Mac OS X rather than to Darwin. Originally committed as revision 10247 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ffplay.c b/ffplay.c
index 76092a3498..dcd75ffbb7 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -865,7 +865,7 @@ static int video_open(VideoState *is){
w = 640;
h = 480;
}
-#ifndef SYS_DARWIN
+#ifndef __APPLE__
screen = SDL_SetVideoMode(w, h, 0, flags);
#else
/* setting bits_per_pixel = 0 or 32 causes blank video on OS X */
@@ -2520,8 +2520,8 @@ int main(int argc, char **argv)
video_disable = 1;
}
flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
-#if !defined(__MINGW32__) && !defined(SYS_DARWIN)
- flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 or darwin */
+#if !defined(__MINGW32__) && !defined(__APPLE__)
+ flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */
#endif
if (SDL_Init (flags)) {
fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError());