aboutsummaryrefslogtreecommitdiffstats
path: root/ffplay.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-07-11 21:45:45 +0000
committerDiego Biurrun <diego@biurrun.de>2006-07-11 21:45:45 +0000
commit2f30a81d192b90fd3b12f2ce40227ed74a331b6d (patch)
treedbdaf9dd7f5862237d81bd3dec64c1572be744c0 /ffplay.c
parent3dc7174e9dbe0d12d84b6159e6733d3865ed53f5 (diff)
downloadffmpeg-2f30a81d192b90fd3b12f2ce40227ed74a331b6d.tar.gz
CONFIG_WIN32 implies MinGW and Cygwin and possibly more, so use just
CONFIG_MINGW or __MINGW32__ instead. Originally committed as revision 5718 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 066dca405e..79e43dd0ae 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -25,7 +25,7 @@
#include <SDL.h>
#include <SDL_thread.h>
-#ifdef CONFIG_WIN32
+#ifdef __MINGW32__
#undef main /* We don't want SDL to override our main() */
#endif
@@ -2423,7 +2423,7 @@ int main(int argc, char **argv)
video_disable = 1;
}
flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
-#if !defined(CONFIG_WIN32) && !defined(CONFIG_DARWIN)
+#if !defined(__MINGW32__) && !defined(CONFIG_DARWIN)
flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 or darwin */
#endif
if (SDL_Init (flags)) {