Ticket #256: patchmainmingw32.diff

File patchmainmingw32.diff, 740 bytes (added by cehoyos, 8 years ago)
  • cmdutils.h

    diff --git a/cmdutils.h b/cmdutils.h
    index eea4401..eca98a3 100644
    a b  
    2929#include "libavformat/avformat.h"
    3030#include "libswscale/swscale.h"
    3131
     32#ifdef __MINGW32__
     33#undef main /* We don't want SDL to override our main() */
     34#endif
     35
    3236/**
    3337 * program name, defined by the program for show_version().
    3438 */
  • ffplay.c

    diff --git a/ffplay.c b/ffplay.c
    index 74d1f10..5997f65 100644
    a b  
    4343# include "libavfilter/avfiltergraph.h"
    4444#endif
    4545
    46 #include "cmdutils.h"
    47 
    4846#include <SDL.h>
    4947#include <SDL_thread.h>
    5048
    51 #ifdef __MINGW32__
    52 #undef main /* We don't want SDL to override our main() */
    53 #endif
     49#include "cmdutils.h"
    5450
    5551#include <unistd.h>
    5652#include <assert.h>