[FFmpeg-cvslog] r18490 - branches/0.5/libswscale/swscale_template.c

[diego]

Author: diego
Date: Mon Apr 13 12:15:04 2009
New Revision: 18490

Log:
Merge fix for GPL code that erroneously made it into the LGPL build.

Modified:
   branches/0.5/libswscale/swscale_template.c

Modified: branches/0.5/libswscale/swscale_template.c
==============================================================================
--- branches/0.5/libswscale/swscale_template.c	Mon Apr 13 12:11:31 2009	(r18489)
+++ branches/0.5/libswscale/swscale_template.c	Mon Apr 13 12:15:04 2009	(r18490)
@@ -2219,7 +2219,7 @@ static inline void RENAME(hyscale)(SwsCo
     }
     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)(SwsCo
     }
     else // fast bilinear upscale / crap downscale
     {
-#if ARCH_X86
+#if ARCH_X86 && CONFIG_GPL
 #if HAVE_MMX2
         int i;
 #if defined(PIC)