[FFmpeg-cvslog] cmdutils: move "#undef main" from ffplay.c to cmdutils.h

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Jun  3 13:30:27 2011 +0200| [25c32d082b1ab4c3567c09f707e75c8ac582806c] | committer: Stefano Sabatini

cmdutils: move "#undef main" from ffplay.c to cmdutils.h

On Windows/MinGW the SDL cflags re-define the main() function, which
results in a linking error if the define is not undeffed.

Since the addition of the SDL output device, SDL cflags are used also
for compiling ffmpeg and ffprobe, so we need to move this trick from
ffplay.c to a common header.

Fix trac issue #256.

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

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

diff --git a/cmdutils.h b/cmdutils.h
index eea4401..eca98a3 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -29,6 +29,10 @@
 #include "libavformat/avformat.h"
 #include "libswscale/swscale.h"
 
+#ifdef __MINGW32__
+#undef main /* We don't want SDL to override our main() */
+#endif
+
 /**
  * program name, defined by the program for show_version().
  */
diff --git a/ffplay.c b/ffplay.c
index 74d1f10..5997f65 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -43,14 +43,10 @@
 # include "libavfilter/avfiltergraph.h"
 #endif
 
-#include "cmdutils.h"
-
 #include <SDL.h>
 #include <SDL_thread.h>
 
-#ifdef __MINGW32__
-#undef main /* We don't want SDL to override our main() */
-#endif
+#include "cmdutils.h"
 
 #include <unistd.h>
 #include <assert.h>