dca: Move the downmix request check outside the loop

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index d140ac392f2c2c48439855b23a394a524f4e81c7..6ea835931885f37b62d597d99b8f24dbb5699bd5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ CCFLAGS     = $(CPPFLAGS) $(CFLAGS)
 OBJCFLAGS  += $(EOBJCFLAGS)
 OBJCCFLAGS  = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)
 ASFLAGS    := $(CPPFLAGS) $(ASFLAGS)
-X86ASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
+X86ASMFLAGS += $(IFLAGS:%=%/) -I$(<D)/ -Pconfig.asm
 HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
 LDFLAGS    := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
 
@@ -42,6 +42,7 @@ endef
 COMPILE_C = $(call COMPILE,CC)
 COMPILE_S = $(call COMPILE,AS)
 COMPILE_M = $(call COMPILE,OBJCC)
+COMPILE_X86ASM = $(call COMPILE,X86ASM)
 COMPILE_HOSTC = $(call COMPILE,HOSTCC)
 
 %.o: %.c
@@ -57,8 +58,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
        $(COMPILE_HOSTC)
 
 %.o: %.asm
-       $(DEPX86ASM) $(X86ASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
-       $(X86ASM) $(X86ASMFLAGS) -I $(<D)/ -o $@ $<
+       $(COMPILE_X86ASM)
        -$(STRIP) $(STRIPFLAGS) $@
 
 %.i: %.c