# HG changeset patch # User diego # Date 1225750005 0 # Node ID eb78efa6cb07ad0f6edd63b37aeee3bca4a099c7 # Parent e5794cd5f4c9708c99f1d79aada9b10522bd5d38 Merge ARCH_BFIN lines. diff -r e5794cd5f4c9 -r eb78efa6cb07 libswscale/Makefile --- a/libswscale/Makefile Mon Nov 03 22:01:03 2008 +0000 +++ b/libswscale/Makefile Mon Nov 03 22:06:45 2008 +0000 @@ -5,14 +5,12 @@ OBJS = rgb2rgb.o swscale.o swscale_avoption.o -OBJS-$(ARCH_BFIN) += swscale_bfin.o yuv2rgb_bfin.o +OBJS-$(ARCH_BFIN) += internal_bfin.o swscale_bfin.o yuv2rgb_bfin.o OBJS-$(CONFIG_GPL) += yuv2rgb.o OBJS-$(CONFIG_MLIB) += yuv2rgb_mlib.o OBJS-$(HAVE_ALTIVEC) += yuv2rgb_altivec.o OBJS-$(HAVE_VIS) += yuv2rgb_vis.o -OBJS-$(ARCH_BFIN) += internal_bfin.o - HEADERS = swscale.h TESTS = cs_test swscale-example