summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-03 19:47:23 +0000
committerhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-03 19:47:23 +0000
commitdb234369ff51a50e4e4c00f5f8a6fee00d7f7eeb (patch)
tree3957e5bc6421be2b573ead702244fcf5ed4d8bc5 /libswscale
parent2e1f8e367040c2d81734b7a555b1121806305dc6 (diff)
downloadmpv-db234369ff51a50e4e4c00f5f8a6fee00d7f7eeb.tar.bz2
mpv-db234369ff51a50e4e4c00f5f8a6fee00d7f7eeb.tar.xz
remove the rest of x86 asm from LGPL build
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28804 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale_template.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c
index 3262b6ee85..6f2e243052 100644
--- a/libswscale/swscale_template.c
+++ b/libswscale/swscale_template.c
@@ -2219,7 +2219,7 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth,
}
else // fast bilinear upscale / crap downscale
{
-#if ARCH_X86
+#if ARCH_X86 && CONFIG_GPL
#if HAVE_MMX2
int i;
#if defined(PIC)
@@ -2492,7 +2492,7 @@ inline static void RENAME(hcscale)(SwsContext *c, uint16_t *dst, long dstWidth,
}
else // fast bilinear upscale / crap downscale
{
-#if ARCH_X86
+#if ARCH_X86 && CONFIG_GPL
#if HAVE_MMX2
int i;
#if defined(PIC)