Take the target address family in account when determining the family of

[ffmpeg] / libswscale / yuv2rgb_template.c

diff --git a/libswscale/yuv2rgb_template.c b/libswscale/yuv2rgb_template.c
index e3a2b7842e7d264414c0d9d7d8646dc7b0f6eb76..c38c3f67ebd3353f0e8b85864529e261a645cc66 100644 (file)
--- a/libswscale/yuv2rgb_template.c
+++ b/libswscale/yuv2rgb_template.c
@@ -1,8 +1,7 @@
 /*
- * yuv2rgb_mmx.c, Software YUV to RGB coverter with Intel MMX "technology"
+ * yuv2rgb_mmx.c, Software YUV to RGB converter with Intel MMX "technology"
  *
  * Copyright (C) 2000, Silicon Integrated System Corp.
- * All Rights Reserved.
  *
  * Author: Olie Lho <ollie@sis.com.tw>
  *
@@ -138,10 +137,10 @@ static inline int RENAME(yuv420_rgb16)(SwsContext *c, uint8_t* src[], int srcStr
     //printf("%X %X %X %X %X %X %X %X %X %X\n", (int)&c->redDither, (int)&b5Dither, (int)src[0], (int)src[1], (int)src[2], (int)dst[0],
     //srcStride[0],srcStride[1],srcStride[2],dstStride[0]);
     for (y= 0; y<srcSliceH; y++ ) {
-        uint8_t *_image = dst[0] + (y+srcSliceY)*dstStride[0];
-        uint8_t *_py = src[0] + y*srcStride[0];
-        uint8_t *_pu = src[1] + (y>>1)*srcStride[1];
-        uint8_t *_pv = src[2] + (y>>1)*srcStride[2];
+        uint8_t *image = dst[0] + (y+srcSliceY)*dstStride[0];
+        uint8_t *py = src[0] + y*srcStride[0];
+        uint8_t *pu = src[1] + (y>>1)*srcStride[1];
+        uint8_t *pv = src[2] + (y>>1)*srcStride[2];
         long index= -h_size/2;
 
         b5Dither= dither8[y&1];
@@ -207,8 +206,8 @@ YUV2RGB
         "add  $4, %0    \n\t"
         " js  1b        \n\t"
 
-        : "+r" (index), "+r" (_image)
-        : "r" (_pu - index), "r" (_pv - index), "r"(&c->redDither), "r" (_py - 2*index)
+        : "+r" (index), "+r" (image)
+        : "r" (pu - index), "r" (pv - index), "r"(&c->redDither), "r" (py - 2*index)
         );
     }
 
@@ -233,10 +232,10 @@ static inline int RENAME(yuv420_rgb15)(SwsContext *c, uint8_t* src[], int srcStr
     //printf("%X %X %X %X %X %X %X %X %X %X\n", (int)&c->redDither, (int)&b5Dither, (int)src[0], (int)src[1], (int)src[2], (int)dst[0],
     //srcStride[0],srcStride[1],srcStride[2],dstStride[0]);
     for (y= 0; y<srcSliceH; y++ ) {
-        uint8_t *_image = dst[0] + (y+srcSliceY)*dstStride[0];
-        uint8_t *_py = src[0] + y*srcStride[0];
-        uint8_t *_pu = src[1] + (y>>1)*srcStride[1];
-        uint8_t *_pv = src[2] + (y>>1)*srcStride[2];
+        uint8_t *image = dst[0] + (y+srcSliceY)*dstStride[0];
+        uint8_t *py = src[0] + y*srcStride[0];
+        uint8_t *pu = src[1] + (y>>1)*srcStride[1];
+        uint8_t *pv = src[2] + (y>>1)*srcStride[2];
         long index= -h_size/2;
 
         b5Dither= dither8[y&1];
@@ -297,8 +296,8 @@ YUV2RGB
         "add $16, %1            \n\t"
         "add $4, %0             \n\t"
         " js 1b                 \n\t"
-        : "+r" (index), "+r" (_image)
-        : "r" (_pu - index), "r" (_pv - index), "r"(&c->redDither), "r" (_py - 2*index)
+        : "+r" (index), "+r" (image)
+        : "r" (pu - index), "r" (pv - index), "r"(&c->redDither), "r" (py - 2*index)
         );
     }
 
@@ -321,10 +320,10 @@ static inline int RENAME(yuv420_rgb24)(SwsContext *c, uint8_t* src[], int srcStr
     __asm__ __volatile__ ("pxor %mm4, %mm4;" /* zero mm4 */ );
 
     for (y= 0; y<srcSliceH; y++ ) {
-        uint8_t *_image = dst[0] + (y+srcSliceY)*dstStride[0];
-        uint8_t *_py = src[0] + y*srcStride[0];
-        uint8_t *_pu = src[1] + (y>>1)*srcStride[1];
-        uint8_t *_pv = src[2] + (y>>1)*srcStride[2];
+        uint8_t *image = dst[0] + (y+srcSliceY)*dstStride[0];
+        uint8_t *py = src[0] + y*srcStride[0];
+        uint8_t *pu = src[1] + (y>>1)*srcStride[1];
+        uint8_t *pv = src[2] + (y>>1)*srcStride[2];
         long index= -h_size/2;
 
         /* this mmx assembly code deals with SINGLE scan line at a time, it convert 8
@@ -443,8 +442,8 @@ YUV2RGB
         "add  $4, %0    \n\t"
         " js  1b        \n\t"
 
-        : "+r" (index), "+r" (_image)
-        : "r" (_pu - index), "r" (_pv - index), "r"(&c->redDither), "r" (_py - 2*index)
+        : "+r" (index), "+r" (image)
+        : "r" (pu - index), "r" (pv - index), "r"(&c->redDither), "r" (py - 2*index)
         );
     }
 
@@ -467,10 +466,10 @@ static inline int RENAME(yuv420_rgb32)(SwsContext *c, uint8_t* src[], int srcStr
     __asm__ __volatile__ ("pxor %mm4, %mm4;" /* zero mm4 */ );
 
     for (y= 0; y<srcSliceH; y++ ) {
-        uint8_t *_image = dst[0] + (y+srcSliceY)*dstStride[0];
-        uint8_t *_py = src[0] + y*srcStride[0];
-        uint8_t *_pu = src[1] + (y>>1)*srcStride[1];
-        uint8_t *_pv = src[2] + (y>>1)*srcStride[2];
+        uint8_t *image = dst[0] + (y+srcSliceY)*dstStride[0];
+        uint8_t *py = src[0] + y*srcStride[0];
+        uint8_t *pu = src[1] + (y>>1)*srcStride[1];
+        uint8_t *pv = src[2] + (y>>1)*srcStride[2];
         long index= -h_size/2;
 
         /* this mmx assembly code deals with SINGLE scan line at a time, it convert 8
@@ -529,8 +528,8 @@ YUV2RGB
         "add  $4, %0    \n\t"
         " js  1b        \n\t"
 
-        : "+r" (index), "+r" (_image)
-        : "r" (_pu - index), "r" (_pv - index), "r"(&c->redDither), "r" (_py - 2*index)
+        : "+r" (index), "+r" (image)
+        : "r" (pu - index), "r" (pv - index), "r"(&c->redDither), "r" (py - 2*index)
         );
     }