Ignore 0-height slice in sws_scale, otherwise a final 0-height slice will

[ffmpeg] / libswscale / Makefile

diff --git a/libswscale/Makefile b/libswscale/Makefile
index 3a410aae08d28068f9434793619ab2cf3b88a262..247ae8d239baf7ff834699bc5a7bf64991228329 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -5,18 +5,20 @@ FFLIBS = avutil
 
 HEADERS = swscale.h
 
-OBJS = rgb2rgb.o swscale.o swscale_avoption.o yuv2rgb.o
+OBJS = options.o rgb2rgb.o swscale.o yuv2rgb.o
 
-OBJS-$(ARCH_BFIN)          +=  internal_bfin.o swscale_bfin.o yuv2rgb_bfin.o
-OBJS-$(CONFIG_MLIB)        +=  yuv2rgb_mlib.o
-OBJS-$(HAVE_ALTIVEC)       +=  yuv2rgb_altivec.o
-OBJS-$(HAVE_VIS)           +=  yuv2rgb_vis.o
+OBJS-$(ARCH_BFIN)          +=  bfin/internal_bfin.o     \
+                               bfin/swscale_bfin.o      \
+                               bfin/yuv2rgb_bfin.o
+OBJS-$(CONFIG_MLIB)        +=  mlib/yuv2rgb_mlib.o
+OBJS-$(HAVE_ALTIVEC)       +=  ppc/yuv2rgb_altivec.o
+OBJS-$(HAVE_VIS)           +=  sparc/yuv2rgb_vis.o
 
-TESTS = cs_test swscale-example
+MMX-OBJS-$(CONFIG_GPL)     +=  x86/yuv2rgb_mmx.o        \
 
-include $(SUBDIR)../subdir.mak
+EXAMPLES  = swscale
+TESTPROGS = colorspace
 
-$(SUBDIR)cs_test: $(SUBDIR)cs_test.o $(SUBDIR)$(LIBNAME)
+DIRS = bfin mlib ppc sparc x86
 
-$(SUBDIR)swscale-example: $(SUBDIR)swscale-example.o $(SUBDIR)$(LIBNAME)
-$(SUBDIR)swscale-example: EXTRALIBS += -lm
+include $(SUBDIR)../subdir.mak