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

Stefano Sabatini stefano.sabatini-lala at poste.it
Fri Jun 3 17:12:51 CEST 2011


On date Friday 2011-06-03 15:40:54 +0200, Michael Niedermayer encoded:
> On Fri, Jun 03, 2011 at 01:36:54PM +0200, Stefano Sabatini wrote:
> > From: Carl Eugen Hoyos <cehoyos at ag.or.at>
> > 
> > On Windows/MinGW the SDL cflags re-define the main() function
> > function, which results in a linking error if not reverted.
> > 
> > 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.
> > ---
> >  cmdutils.h |    4 ++++
> >  ffplay.c   |    6 +-----
> >  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> ok if tested

Pushed.
-- 
FFmpeg = Fostering and Foolish Mournful Powerful Ecstatic God


More information about the ffmpeg-devel mailing list