Commit 31319a8c authored by Fabrice Bellard's avatar Fabrice Bellard
Browse files

win32 compile fix for ffplay by gbazin at altern dot org

Originally committed as revision 1958 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 11e659c2
......@@ -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
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment