aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorMarc Hoffman <mmhoffm@gmail.com>2007-06-22 13:03:40 +0000
committerMarc Hoffman <mmhoffm@gmail.com>2007-06-22 13:03:40 +0000
commit1ebbfe159f4d7c3ea858368cd6ece5adbae0e1e8 (patch)
tree7984e7dda30cd196115bee8f3b44168c11672d5d /libswscale
parentc185b405c1410b4195d3cfa5acda3de3743aad00 (diff)
downloadffmpeg-1ebbfe159f4d7c3ea858368cd6ece5adbae0e1e8.tar.gz
integrating ff_bfin_get_unscaled_swscale into the system
Originally committed as revision 23605 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/Makefile4
-rw-r--r--libswscale/swscale.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/libswscale/Makefile b/libswscale/Makefile
index 95f90b7575..35a132c218 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -12,7 +12,9 @@ OBJS= swscale.o rgb2rgb.o
OBJS-$(HAVE_ALTIVEC) += yuv2rgb_altivec.o
OBJS-$(CONFIG_GPL) += yuv2rgb.o
-OBJS-$(ARCH_BFIN) += yuv2rgb_bfin.o
+OBJS-$(ARCH_BFIN) += yuv2rgb_bfin.o \
+ swscale_bfin.o \
+
ASM_OBJS-$(ARCH_BFIN) += internal_bfin.o
HEADERS = swscale.h rgb2rgb.h
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index b53d2e52e4..1cda63b0bb 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -2219,6 +2219,11 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH
c->swScale= gray16swap;
}
+#ifdef ARCH_BFIN
+ if (flags & SWS_CPU_CAPS_BFIN)
+ ff_bfin_get_unscaled_swscale (c);
+#endif
+
if (c->swScale){
if (flags&SWS_PRINT_INFO)
av_log(c, AV_LOG_INFO, "SwScaler: using unscaled %s -> %s special converter\n",