[FFmpeg-devel] [PATCH] library.mak: Workaround SDL redefining main and breaking fate tests on mingw

Michael Niedermayer michaelni at gmx.at
Fri Jun 19 01:06:41 CEST 2015


-Umain does not work as SDL adds its defines afterwards

Fixes Ticket3368

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 library.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.mak b/library.mak
index 7c26024..1967a0a 100644
--- a/library.mak
+++ b/library.mak
@@ -33,7 +33,7 @@ $(SUBDIR)x86/%.o: $(SUBDIR)x86/%$(YASMD).asm
 
 LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS)
 $(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i):   CPPFLAGS += -DHAVE_AV_CONFIG_H
-$(TESTOBJS) $(TESTOBJS:.o=.i): CPPFLAGS += -DTEST
+$(TESTOBJS) $(TESTOBJS:.o=.i): CPPFLAGS += -DTEST -DSDL_main=main
 
 $(SUBDIR)$(LIBNAME): $(OBJS)
 	$(RM) $@
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list