[SCM] libav/experimental: Discard two symbols from libswscale.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0cb25594454dbfe8c855a4c512796897d525e5d4
Author: Carl Eugen Hoyos <cehoyos at rainbow.studorg.tuwien.ac.at>
Date:   Fri Feb 22 08:08:19 2008 +0000

    Discard two symbols from libswscale.
    
    Originally committed as revision 26060 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 6bbf61b..4dc2c32 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -194,11 +194,11 @@ static volatile uint64_t attribute_used __attribute__((aligned(8))) g5Dither;
 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
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 96ec78c..aa583a6 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -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 */
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c
index 20392c2..0df4b88 100644
--- a/libswscale/swscale_template.c
+++ b/libswscale/swscale_template.c
@@ -3124,10 +3124,10 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
         }
 
 #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)
         {
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index 83a7e67..8b46223 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -170,14 +170,6 @@ static volatile uint64_t attribute_used __attribute__((aligned(8))) g5Dither;
 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
diff --git a/libswscale/yuv2rgb_template.c b/libswscale/yuv2rgb_template.c
index 49fd7a7..d86bc4b 100644
--- a/libswscale/yuv2rgb_template.c
+++ b/libswscale/yuv2rgb_template.c
@@ -143,10 +143,10 @@ static inline int RENAME(yuv420_rgb16)(SwsContext *c, uint8_t* src[], int srcStr
         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)(SwsContext *c, uint8_t* src[], int srcStr
         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__ (

-- 
Libav/FFmpeg packaging