Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libswscale / Makefile

diff --git a/libswscale/Makefile b/libswscale/Makefile
index 97206200fb1767f2b4820fe58b9d2332f381cbd9..942545d2824ab6589ef32d7d3bae6328d28499f6 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -19,6 +19,9 @@ OBJS-$(HAVE_MMX)           +=  x86/rgb2rgb.o            \
                                x86/swscale_mmx.o        \
                                x86/yuv2rgb_mmx.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