[MPlayer-cvslog] r26060 - in trunk/libswscale: swscale.c swscale_internal.h swscale_template.c yuv2rgb.c yuv2rgb_template.c

[cehoyos]

Author: cehoyos
Date: Fri Feb 22 09:08:19 2008
New Revision: 26060

Log:
Discard two symbols from libswscale.

Modified:
   trunk/libswscale/swscale.c
   trunk/libswscale/swscale_internal.h
   trunk/libswscale/swscale_template.c
   trunk/libswscale/yuv2rgb.c
   trunk/libswscale/yuv2rgb_template.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	(original)
+++ trunk/libswscale/swscale.c	Fri Feb 22 09:08:19 2008
@@ -194,11 +194,11 @@ static volatile uint64_t attribute_used 
 static volatile uint64_t attribute_used __attribute__((aligned(8))) g6Dither;
 static volatile uint64_t attribute_used __attribute__((aligned(8))) r5Dither;
 
-DECLARE_ASM_CONST(8, uint64_t, dither4[2])={
+const DECLARE_ALIGNED(8, uint64_t, ff_dither4[2]) = {
         0x0103010301030103LL,
         0x0200020002000200LL,};
 
-DECLARE_ASM_CONST(8, uint64_t, dither8[2])={
+const DECLARE_ALIGNED(8, uint64_t, ff_dither8[2]) = {
         0x0602060206020602LL,
         0x0004000400040004LL,};
 
@@ -367,7 +367,7 @@ void in_asm_used_var_warning_killer()
 {
     volatile int i= bF8+bFC+w10+
     bm00001111+bm00000111+bm11111000+b16Mask+g16Mask+r16Mask+b15Mask+g15Mask+r15Mask+
-    ff_M24A+ff_M24B+ff_M24C+w02 + b5Dither+g5Dither+r5Dither+g6Dither+dither4[0]+dither8[0]+bm01010101;
+    ff_M24A+ff_M24B+ff_M24C+w02 + b5Dither+g5Dither+r5Dither+g6Dither+ff_dither4[0]+ff_dither8[0]+bm01010101;
     if (i) i=0;
 }
 #endif

Modified: trunk/libswscale/swscale_internal.h
==============================================================================
--- trunk/libswscale/swscale_internal.h	(original)
+++ trunk/libswscale/swscale_internal.h	Fri Feb 22 09:08:19 2008
@@ -272,4 +272,7 @@ static inline int fmt_depth(int fmt)
     }
 }
 
+extern const DECLARE_ALIGNED(8, uint64_t, ff_dither4[2]);
+extern const DECLARE_ALIGNED(8, uint64_t, ff_dither8[2]);
+
 #endif /* FFMPEG_SWSCALE_INTERNAL_H */

Modified: trunk/libswscale/swscale_template.c
==============================================================================
--- trunk/libswscale/swscale_template.c	(original)
+++ trunk/libswscale/swscale_template.c	Fri Feb 22 09:08:19 2008
@@ -3124,10 +3124,10 @@ static int RENAME(swScale)(SwsContext *c
         }
 
 #ifdef HAVE_MMX
-        b5Dither= dither8[dstY&1];
-        g6Dither= dither4[dstY&1];
-        g5Dither= dither8[dstY&1];
-        r5Dither= dither8[(dstY+1)&1];
+        b5Dither= ff_dither8[dstY&1];
+        g6Dither= ff_dither4[dstY&1];
+        g5Dither= ff_dither8[dstY&1];
+        r5Dither= ff_dither8[(dstY+1)&1];
 #endif
         if (dstY < dstH-2)
         {

Modified: trunk/libswscale/yuv2rgb.c
==============================================================================
--- trunk/libswscale/yuv2rgb.c	(original)
+++ trunk/libswscale/yuv2rgb.c	Fri Feb 22 09:08:19 2008
@@ -170,14 +170,6 @@ static volatile uint64_t attribute_used 
 static volatile uint64_t attribute_used __attribute__((aligned(8))) g6Dither;
 static volatile uint64_t attribute_used __attribute__((aligned(8))) r5Dither;
 
-DECLARE_ASM_CONST(8, uint64_t, dither4[2])={
-    0x0103010301030103LL,
-    0x0200020002000200LL,};
-
-DECLARE_ASM_CONST(8, uint64_t, dither8[2])={
-    0x0602060206020602LL,
-    0x0004000400040004LL,};
-
 #undef HAVE_MMX
 
 //MMX versions

Modified: trunk/libswscale/yuv2rgb_template.c
==============================================================================
--- trunk/libswscale/yuv2rgb_template.c	(original)
+++ trunk/libswscale/yuv2rgb_template.c	Fri Feb 22 09:08:19 2008
@@ -143,10 +143,10 @@ static inline int RENAME(yuv420_rgb16)(S
         uint8_t *pv = src[2] + (y>>1)*srcStride[2];
         long index= -h_size/2;
 
-        b5Dither= dither8[y&1];
-        g6Dither= dither4[y&1];
-        g5Dither= dither8[y&1];
-        r5Dither= dither8[(y+1)&1];
+        b5Dither= ff_dither8[y&1];
+        g6Dither= ff_dither4[y&1];
+        g5Dither= ff_dither8[y&1];
+        r5Dither= ff_dither8[(y+1)&1];
         /* this mmx assembly code deals with SINGLE scan line at a time, it convert 8
            pixels in each iteration */
         __asm__ __volatile__ (
@@ -238,10 +238,10 @@ static inline int RENAME(yuv420_rgb15)(S
         uint8_t *pv = src[2] + (y>>1)*srcStride[2];
         long index= -h_size/2;
 
-        b5Dither= dither8[y&1];
-        g6Dither= dither4[y&1];
-        g5Dither= dither8[y&1];
-        r5Dither= dither8[(y+1)&1];
+        b5Dither= ff_dither8[y&1];
+        g6Dither= ff_dither4[y&1];
+        g5Dither= ff_dither8[y&1];
+        r5Dither= ff_dither8[(y+1)&1];
         /* this mmx assembly code deals with SINGLE scan line at a time, it convert 8
            pixels in each iteration */
         __asm__ __volatile__ (