Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libswscale / Makefile

diff --git a/libswscale/Makefile b/libswscale/Makefile
index 7f74677ceca063ea23ae1b5637c8d32e3a25ae66..6f25145c3a16674b6645c73c3ba0762346d6cb56 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -21,8 +21,8 @@ OBJS-$(HAVE_MMX)           +=  x86/rgb2rgb.o            \
 OBJS-$(HAVE_VIS)           +=  sparc/yuv2rgb_vis.o
 OBJS-$(HAVE_YASM)          +=  x86/scale.o
 
+$(SUBDIR)x86/swscale_mmx.o: CFLAGS += $(NOREDZONE_FLAGS)
+
 TESTPROGS = colorspace swscale
 
 DIRS = bfin mlib ppc sparc x86
-
-include $(SRC_PATH)/subdir.mak