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 95f90b7575b6ab0a97588181a127893428f6ea2b..247ae8d239baf7ff834699bc5a7bf64991228329 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -1,28 +1,24 @@
+include $(SUBDIR)../config.mak
 
-include ../config.mak
+NAME = swscale
+FFLIBS = avutil
 
-NAME=swscale
-LIBVERSION=$(SWSVERSION)
-LIBMAJOR=$(SWSMAJOR)
+HEADERS = swscale.h
 
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+OBJS = options.o rgb2rgb.o swscale.o yuv2rgb.o
 
-OBJS= swscale.o rgb2rgb.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
 
-OBJS-$(HAVE_ALTIVEC)       +=  yuv2rgb_altivec.o
-OBJS-$(CONFIG_GPL)         +=  yuv2rgb.o
+MMX-OBJS-$(CONFIG_GPL)     +=  x86/yuv2rgb_mmx.o        \
 
-OBJS-$(ARCH_BFIN)          +=  yuv2rgb_bfin.o
-ASM_OBJS-$(ARCH_BFIN)      += internal_bfin.o
+EXAMPLES  = swscale
+TESTPROGS = colorspace
 
-HEADERS = swscale.h rgb2rgb.h
+DIRS = bfin mlib ppc sparc x86
 
-include ../common.mak
-
-cs_test: cs_test.o $(LIB)
-
-swscale-example: swscale-example.o $(LIB)
-swscale-example: EXTRALIBS += -lm
-
-clean::
-       rm -f cs_test swscale-example
+include $(SUBDIR)../subdir.mak