[FFmpeg-cvslog] cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32

[John Peebles]

ffmpeg | branch: master | John Peebles <johnpeeb at gmail.com> | Fri May 16 21:44:19 2014 -0400| [e11697759d06900195136df2be035d0d052316a1] | committer: Marton Balint

cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32

With the previous patch, this should fix ticket #3580 as well.

Signed-off-by: John Peebles <johnpeeb at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e11697759d06900195136df2be035d0d052316a1
---

 cmdutils.h |    2 +-
 ffplay.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmdutils.h b/cmdutils.h
index 3fbaae9..c4a16aa 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -30,7 +30,7 @@
 #include "libavformat/avformat.h"
 #include "libswscale/swscale.h"
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 #undef main /* We don't want SDL to override our main() */
 #endif
 
diff --git a/ffplay.c b/ffplay.c
index fabb48c..df7e870 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -3635,7 +3635,7 @@ int main(int argc, char **argv)
         flags &= ~SDL_INIT_AUDIO;
     if (display_disable)
         SDL_putenv(dummy_videodriver); /* For the event queue, we always need a video driver. */
-#if !defined(__MINGW32__) && !defined(__APPLE__)
+#if !defined(_WIN32) && !defined(__APPLE__)
     flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */
 #endif
     if (SDL_Init (flags)) {