From 43c7c7c7cfd5c176cef71ea7c1733e7bfa69787c Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Sun, 13 May 2007 14:01:15 +0000 Subject: [PATCH] use DECLARE_ALIGNED from mem.h (which is included through common.h) Originally committed as revision 9015 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/dsputil.h | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 549eb25..63e1c47 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -470,11 +470,7 @@ static inline int get_penalty_factor(int lambda, int lambda2, int type){ one or more MultiMedia extension */ int mm_support(void); -#ifdef __GNUC__ - #define DECLARE_ALIGNED_16(t,v) t v __attribute__ ((aligned (16))) -#else - #define DECLARE_ALIGNED_16(t,v) __declspec(align(16)) t v -#endif +#define DECLARE_ALIGNED_16(t, v) DECLARE_ALIGNED(16, t, v) #if defined(HAVE_MMX) @@ -507,11 +503,7 @@ static inline void emms(void) emms();\ } -#ifdef __GNUC__ - #define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) -#else - #define DECLARE_ALIGNED_8(t,v) __declspec(align(8)) t v -#endif +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 @@ -522,7 +514,7 @@ void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); /* This is to use 4 bytes read to the IDCT pointers for some 'zero' line optimizations */ -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (4))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(4, t, v) #define STRIDE_ALIGN 4 #define MM_IWMMXT 0x0100 /* XScale IWMMXT */ @@ -534,7 +526,7 @@ void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx); #elif defined(HAVE_MLIB) /* SPARC/VIS IDCT needs 8-byte aligned DCT blocks */ -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx); @@ -542,13 +534,13 @@ void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_SPARC) /* SPARC/VIS IDCT needs 8-byte aligned DCT blocks */ -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_ALPHA) -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 void dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); @@ -565,35 +557,35 @@ extern int mm_flags; #undef pixel #endif -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (16))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) #define STRIDE_ALIGN 16 void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx); #elif defined(HAVE_MMI) -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (16))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) #define STRIDE_ALIGN 16 void dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_SH4) -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_BFIN) -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 void dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx); #else -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 #endif -- 2.7.4