[FFmpeg-cvslog] r17556 - trunk/configure

[Jindrich Makovicka]

On Thu, 26 Feb 2009 09:07:40 -0500
"Ronald S. Bultje" <rsbultje at gmail.com> wrote:

> Hi,
> 
> On Tue, Feb 24, 2009 at 10:38 AM, Diego Biurrun <diego at biurrun.de>
> wrote:
> > swscale.c and rgb2rgb.c are still GPL because the optimizations have
> > not been factored out yet, it's just the yuv2rgb stuff that is
> > purely LGPL now.
> 
> There's #if GPL all around the mmx/etc code (I checked rgb2rgb.c and
> swscale.c) and it compiles fine when CONFIG_GPL=0. I think the
> original change was fine, right?

There is still some x86 ASM (non-mmx) code. The following patch should
be enough to make the result LGPLable. Checked by running the code
through gcc -E on x86-64. There is no ASM lest except the trivial stuff
like emms.

Index: swscale_template.c
===================================================================
--- swscale_template.c	(revision 28803)
+++ swscale_template.c	(working copy)
@@ -2219,7 +2219,7 @@
     }
     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 @@
     }
     else // fast bilinear upscale / crap downscale
     {
-#if ARCH_X86
+#if ARCH_X86 && CONFIG_GPL
 #if HAVE_MMX2
         int i;
 #if defined(PIC)

-- 
Jindrich Makovicka