[FFmpeg-cvslog] r31278 - in trunk/libswscale/x86: yuv2rgb_mmx.c yuv2rgb_template.c

[diego]

Author: diego
Date: Sun May 30 10:31:23 2010
New Revision: 31278

Log:
Remove GPL-licensed YUV to RGB MMX routines.
We now have an LGPL replacement that is at least equally fast.

Deleted:
   trunk/libswscale/x86/yuv2rgb_template.c
Modified:
   trunk/libswscale/x86/yuv2rgb_mmx.c

Modified: trunk/libswscale/x86/yuv2rgb_mmx.c
==============================================================================
--- trunk/libswscale/x86/yuv2rgb_mmx.c	Sun May 30 07:16:29 2010	(r31277)
+++ trunk/libswscale/x86/yuv2rgb_mmx.c	Sun May 30 10:31:23 2010	(r31278)
@@ -52,22 +52,14 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 
 #define HAVE_MMX2 0
 #define HAVE_AMD3DNOW 0
 #define RENAME(a) a ## _MMX
-#if CONFIG_GPL
-#include "yuv2rgb_template.c"
-#else
 #include "yuv2rgb_template2.c"
-#endif
 
 //MMX2 versions
 #undef RENAME
 #undef HAVE_MMX2
 #define HAVE_MMX2 1
 #define RENAME(a) a ## _MMX2
-#if CONFIG_GPL
-#include "yuv2rgb_template.c"
-#else
 #include "yuv2rgb_template2.c"
-#endif
 
 SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c)
 {