From c0cf20a24a230b0937ad494b43ffe3e4cf318c27 Mon Sep 17 00:00:00 2001
From: Ramiro Polla <ramiro.polla@gmail.com>
Date: Thu, 4 Jun 2009 22:50:38 +0000
Subject: [PATCH] Use DECLARE_ALIGNED macro instead of __attribute__((aligned))
 for ppc code.

Originally committed as revision 29350 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
---
 libswscale/ppc/swscale_altivec_template.c | 8 ++++----
 libswscale/ppc/yuv2rgb_altivec.c          | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libswscale/ppc/swscale_altivec_template.c b/libswscale/ppc/swscale_altivec_template.c
index c24970464c..8919177bcc 100644
--- a/libswscale/ppc/swscale_altivec_template.c
+++ b/libswscale/ppc/swscale_altivec_template.c
@@ -92,7 +92,7 @@ yuv2yuvX_altivec_real(const int16_t *lumFilter, int16_t **lumSrc, int lumFilterS
     const vector signed int vini = {(1 << 18), (1 << 18), (1 << 18), (1 << 18)};
     register int i, j;
     {
-        int __attribute__ ((aligned (16))) val[dstW];
+        DECLARE_ALIGNED(16, int, val[dstW]);
 
         for (i = 0; i < (dstW -7); i+=4) {
             vec_st(vini, i << 2, val);
@@ -140,8 +140,8 @@ yuv2yuvX_altivec_real(const int16_t *lumFilter, int16_t **lumSrc, int lumFilterS
         altivec_packIntArrayToCharArray(val, dest, dstW);
     }
     if (uDest != 0) {
-        int  __attribute__ ((aligned (16))) u[chrDstW];
-        int  __attribute__ ((aligned (16))) v[chrDstW];
+        DECLARE_ALIGNED(16, int, u[chrDstW]);
+        DECLARE_ALIGNED(16, int, v[chrDstW]);
 
         for (i = 0; i < (chrDstW -7); i+=4) {
             vec_st(vini, i << 2, u);
@@ -214,7 +214,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW,
                                        const int16_t *filterPos, int filterSize)
 {
     register int i;
-    int __attribute__ ((aligned (16))) tempo[4];
+    DECLARE_ALIGNED(16, int, tempo[4]);
 
     if (filterSize % 4) {
         for (i=0; i<dstW; i++) {
diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
index 43879ea62d..550afc4023 100644
--- a/libswscale/ppc/yuv2rgb_altivec.c
+++ b/libswscale/ppc/yuv2rgb_altivec.c
@@ -753,7 +753,7 @@ SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c)
 void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], int brightness, int contrast, int saturation)
 {
     union {
-        signed short tmp[8] __attribute__ ((aligned(16)));
+        DECLARE_ALIGNED(16, signed short, tmp[8]);
         vector signed short vec;
     } buf;
 
@@ -800,7 +800,7 @@ ff_yuv2packedX_altivec(SwsContext *c,
 
     vector signed short   RND = vec_splat_s16(1<<3);
     vector unsigned short SCL = vec_splat_u16(4);
-    unsigned long scratch[16] __attribute__ ((aligned (16)));
+    DECLARE_ALIGNED(16, unsigned long, scratch[16]);
 
     vector signed short *YCoeffs, *CCoeffs;