Mercurial > mplayer.hg

changeset 26028:afd429e00184

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Discard two symbols from libswscale.
author cehoyos
date Fri, 22 Feb 2008 08:08:19 +0000
parents 21ffd4958ab5
children 4129c8cfa742
files libswscale/swscale.c libswscale/swscale_internal.h libswscale/swscale_template.c libswscale/yuv2rgb.c libswscale/yuv2rgb_template.c
diffstat 5 files changed, 18 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Fri Feb 22 06:57:51 2008 +0000
+++ b/libswscale/swscale.c	Fri Feb 22 08:08:19 2008 +0000
@@ -194,11 +194,11 @@
 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 @@
 {
     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
--- a/libswscale/swscale_internal.h	Fri Feb 22 06:57:51 2008 +0000
+++ b/libswscale/swscale_internal.h	Fri Feb 22 08:08:19 2008 +0000
@@ -272,4 +272,7 @@
     }
 }
 
+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 */
--- a/libswscale/swscale_template.c	Fri Feb 22 06:57:51 2008 +0000
+++ b/libswscale/swscale_template.c	Fri Feb 22 08:08:19 2008 +0000
@@ -3124,10 +3124,10 @@
         }
 
 #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)
         {
--- a/libswscale/yuv2rgb.c	Fri Feb 22 06:57:51 2008 +0000
+++ b/libswscale/yuv2rgb.c	Fri Feb 22 08:08:19 2008 +0000
@@ -170,14 +170,6 @@
 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
--- a/libswscale/yuv2rgb_template.c	Fri Feb 22 06:57:51 2008 +0000
+++ b/libswscale/yuv2rgb_template.c	Fri Feb 22 08:08:19 2008 +0000
@@ -143,10 +143,10 @@
         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 @@
         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__ (