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

James Almer git at videolan.org
Fri Jun 26 21:41:55 CEST 2015


ffmpeg | branch: release/2.7 | James Almer <jamrial at gmail.com> | Fri Jun 19 12:11:16 2015 +0200| [459090181fe53cea5cf43982b363d8a98fc60a50] | committer: James Almer

library.mak: Workaround SDL redefining main and breaking fate tests on mingw

Fixes Ticket3368

Commit message by commiter
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

(cherry picked from commit a9af9da6311b4ba50abe55d14d42a4d4818e83d8)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=459090181fe53cea5cf43982b363d8a98fc60a50
---

 library.mak |    1 +
 1 file changed, 1 insertion(+)

diff --git a/library.mak b/library.mak
index 7c26024..29460b8 100644
--- a/library.mak
+++ b/library.mak
@@ -34,6 +34,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): CFLAGS += -Umain
 
 $(SUBDIR)$(LIBNAME): $(OBJS)
 	$(RM) $@



More information about the ffmpeg-cvslog mailing list