[SCM] libav/experimental: Move bfin specific code to its subdir.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:42:41 UTC 2013


The following commit has been merged in the experimental branch:
commit d5e9bc06360666651fabb3f75e37bae8cbf49028
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Fri Mar 27 22:56:56 2009 +0000

    Move bfin specific code to its subdir.
    
    Originally committed as revision 29079 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/Makefile b/libswscale/Makefile
index 61f5e5a..947cdfd 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -7,7 +7,9 @@ HEADERS = swscale.h
 
 OBJS = rgb2rgb.o swscale.o swscale_avoption.o yuv2rgb.o
 
-OBJS-$(ARCH_BFIN)          +=  internal_bfin.o swscale_bfin.o bfin/yuv2rgb_bfin.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
diff --git a/libswscale/internal_bfin.S b/libswscale/bfin/internal_bfin.S
similarity index 100%
rename from libswscale/internal_bfin.S
rename to libswscale/bfin/internal_bfin.S
diff --git a/libswscale/swscale_bfin.c b/libswscale/bfin/swscale_bfin.c
similarity index 96%
rename from libswscale/swscale_bfin.c
rename to libswscale/bfin/swscale_bfin.c
index 0c3ea4d..2ad81d8 100644
--- a/libswscale/swscale_bfin.c
+++ b/libswscale/bfin/swscale_bfin.c
@@ -27,9 +27,9 @@
 #include <assert.h>
 #include "config.h"
 #include <unistd.h>
-#include "rgb2rgb.h"
-#include "swscale.h"
-#include "swscale_internal.h"
+#include "libswscale/rgb2rgb.h"
+#include "libswscale/swscale.h"
+#include "libswscale/swscale_internal.h"
 
 #ifdef __FDPIC__
 #define L1CODE __attribute__ ((l1_text))
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 91f05ad..785c00a 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -226,6 +226,7 @@ SwsFunc ff_yuv2rgb_init_vis(SwsContext *c);
 SwsFunc ff_yuv2rgb_init_mlib(SwsContext *c);
 SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c);
 SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c);
+void ff_bfin_get_unscaled_swscale(SwsContext *c);
 void ff_yuv2packedX_altivec(SwsContext *c,
                           int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize,
                           int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list