From 42a362e57b25c82ea3d793f04ef98c0e5a00066b Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 18 Feb 2008 23:01:26 +0000 Subject: [PATCH] Refactor vcprm and vcii macros by using the AVV macro. Originally committed as revision 12140 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ppc/util_altivec.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libavcodec/ppc/util_altivec.h b/libavcodec/ppc/util_altivec.h index a534df9..6a8afb1 100644 --- a/libavcodec/ppc/util_altivec.h +++ b/libavcodec/ppc/util_altivec.h @@ -43,11 +43,8 @@ #define WORD_s2 0x18,0x19,0x1a,0x1b #define WORD_s3 0x1c,0x1d,0x1e,0x1f -#ifdef __APPLE_CC__ -#define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d) -#else -#define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} -#endif +#define vcprm(a,b,c,d) (const vector unsigned char)AVV(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d) +#define vcii(a,b,c,d) (const vector float)AVV(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d) // vcprmle is used to keep the same index as in the SSE version. // it's the same as vcprm, with the index inversed @@ -60,12 +57,6 @@ #define FLOAT_p 1. -#ifdef __APPLE_CC__ -#define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d) -#else -#define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d} -#endif - // Transpose 8x8 matrix of 16-bit elements (in-place) #define TRANSPOSE8(a,b,c,d,e,f,g,h) \ do { \ -- 2.7.4