[SCM] libav/experimental: Merge ARCH_BFIN lines.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:32:02 UTC 2013


The following commit has been merged in the experimental branch:
commit 6408c25b9538509df5c56e80ca5f1dc32b3b579a
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Nov 3 22:06:45 2008 +0000

    Merge ARCH_BFIN lines.
    
    Originally committed as revision 27889 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/Makefile b/libswscale/Makefile
index 3203403..84675e0 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -5,14 +5,12 @@ FFLIBS = avutil
 
 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

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list