[FFmpeg-cvslog] common.mak: add forgotten hunk from last merge

Michael Niedermayer git at videolan.org
Thu Aug 9 03:57:55 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  9 03:46:43 2012 +0200| [b41d481aa4ee6ec916f7bea35dcaf8d35c0a19c1] | committer: Michael Niedermayer

common.mak: add forgotten hunk from last merge

Found-by: jamal <jamrial at gmail.com>
Author of the hunk: Mans Rullgard <mans at mansr.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 common.mak |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.mak b/common.mak
index ab937e7..43935e7 100644
--- a/common.mak
+++ b/common.mak
@@ -56,8 +56,8 @@ COMPILE_S = $(call COMPILE,AS)
 %.o: %.S
 	$(COMPILE_S)
 
-%.ho: %.h
-	$(CC) $(CCFLAGS) -c $(CC_O) -x c $<
+%.h.c:
+	$(Q)echo '#include "$*.h"' >$@
 
 %.ver: %.v
 	$(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@



More information about the ffmpeg-cvslog mailing list