1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

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.
This commit is contained in:
Carl Eugen Hoyos 2011-06-03 13:30:27 +02:00 committed by Stefano Sabatini
parent c9614bb22c
commit 25c32d082b
2 changed files with 5 additions and 5 deletions

View File

@ -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().
*/

View File

@ -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>