win32 compile fix for ffplay by gbazin at altern dot org

Originally committed as revision 1958 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 9 insertions, 1 deletions

diff --git a/configure b/configure
index 5c72358774..a92a60fe26 100755
--- a/configure
+++ b/configure
@@ -627,6 +627,7 @@ fi
 
 cat > $TMPC << EOF
 #include <SDL.h>
+#undef main /* We don't want SDL to override our main() */
 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
 EOF
 
diff --git a/ffplay.c b/ffplay.c
index b2b4d18bed..1bc8192db0 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -25,6 +25,10 @@
 #include <SDL.h>
 #include <SDL_thread.h>
 
+#ifdef CONFIG_WIN32
+#undef main /* We don't want SDL to override our main() */
+#endif
+
 #if defined(__linux__)
 #define HAVE_X11
 #endif
@@ -1359,7 +1363,10 @@ int main(int argc, char **argv)
     if (display_disable) {
         video_disable = 1;
     }
-    flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_EVENTTHREAD;
+    flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
+#ifndef CONFIG_WIN32
+    flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 */
+#endif
     if (SDL_Init (flags)) {
         fprintf(stderr, "Could not initialize SDL - exiting\n");
         exit(1);