From 241c55aabe3dfeef2caf413bb2ec37504f488056 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 13 Apr 2009 10:15:04 +0000
Subject: Merge fix for GPL code that erroneously made it into the LGPL build.

Originally committed as revision 18490 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
---
 libswscale/swscale_template.c | 4 ++--
 1 file 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)
-- 
cgit v1.2.3