summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-08-22 22:46:39 +0000
committerDiego Biurrun <diego@biurrun.de>2007-08-22 22:46:39 +0000
commit9d16f87ffddff90182d679531a3c3b09f1243471 (patch)
tree9ed49f703a7564056f452a28b0dc8a713749f672 /ffplay.c
parente241ba148fb725c84cdaef896f960767c5d6dcc4 (diff)
Rename CONFIG_DARWIN to SYS_DARWIN, it is not configurable (in FFmpeg).
Originally committed as revision 10190 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffplay.c b/ffplay.c
index ad5fd1c76f..cbbeb79d24 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -865,7 +865,7 @@ static int video_open(VideoState *is){
w = 640;
h = 480;
}
-#ifndef CONFIG_DARWIN
+#ifndef SYS_DARWIN
screen = SDL_SetVideoMode(w, h, 0, flags);
#else
/* setting bits_per_pixel = 0 or 32 causes blank video on OS X */
@@ -2541,7 +2541,7 @@ int main(int argc, char **argv)
video_disable = 1;
}
flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
-#if !defined(__MINGW32__) && !defined(CONFIG_DARWIN)
+#if !defined(__MINGW32__) && !defined(SYS_DARWIN)
flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 or darwin */
#endif
if (SDL_Init (flags)) {