From 74a841af8bbdec8070f9eaeb7f7b235cd9c8be7e Mon Sep 17 00:00:00 2001
From: Ramiro Polla <ramiro.polla@gmail.com>
Date: Thu, 4 Jun 2009 23:25:09 +0000
Subject: [PATCH] Replace more uses of __attribute__((aligned)) by
 DECLARE_ALIGNED.

Originally committed as revision 19089 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/dct-test.c        | 10 +++++-----
 libavcodec/x86/fft_sse.c     |  2 +-
 libavcodec/x86/h264dsp_mmx.c |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index 9522e1d7f0..419464cf54 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -186,9 +186,9 @@ static void idct_mmx_init(void)
     }
 }
 
-static DCTELEM block[64] __attribute__ ((aligned (16)));
-static DCTELEM block1[64] __attribute__ ((aligned (8)));
-static DCTELEM block_org[64] __attribute__ ((aligned (8)));
+DECLARE_ALIGNED(16, static DCTELEM, block[64]);
+DECLARE_ALIGNED(8, static DCTELEM, block1[64]);
+DECLARE_ALIGNED(8, static DCTELEM, block_org[64]);
 
 static inline void mmx_emms(void)
 {
@@ -384,8 +384,8 @@ static void dct_error(const char *name, int is_idct,
 #endif
 }
 
-static uint8_t img_dest[64] __attribute__ ((aligned (8)));
-static uint8_t img_dest1[64] __attribute__ ((aligned (8)));
+DECLARE_ALIGNED(8, static uint8_t, img_dest[64]);
+DECLARE_ALIGNED(8, static uint8_t, img_dest1[64]);
 
 static void idct248_ref(uint8_t *dest, int linesize, int16_t *block)
 {
diff --git a/libavcodec/x86/fft_sse.c b/libavcodec/x86/fft_sse.c
index 3d9f1c5145..e6cb3dce65 100644
--- a/libavcodec/x86/fft_sse.c
+++ b/libavcodec/x86/fft_sse.c
@@ -22,7 +22,7 @@
 #include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
 
-static const int m1m1m1m1[4] __attribute__((aligned(16))) =
+DECLARE_ALIGNED(16, static const int, m1m1m1m1[4]) =
     { 1 << 31, 1 << 31, 1 << 31, 1 << 31 };
 
 void ff_fft_dispatch_sse(FFTComplex *z, int nbits);
diff --git a/libavcodec/x86/h264dsp_mmx.c b/libavcodec/x86/h264dsp_mmx.c
index e7cff2f4c2..07ee6f79f7 100644
--- a/libavcodec/x86/h264dsp_mmx.c
+++ b/libavcodec/x86/h264dsp_mmx.c
@@ -157,7 +157,7 @@ static inline void h264_idct8_1d(int16_t *block)
 static void ff_h264_idct8_add_mmx(uint8_t *dst, int16_t *block, int stride)
 {
     int i;
-    int16_t __attribute__ ((aligned(8))) b2[64];
+    DECLARE_ALIGNED_8(int16_t, b2[64]);
 
     block[0] += 32;