diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-26 12:26:04 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-26 12:26:04 +0000 |
| commit | d1dcbd2f87335437544484b16f933d520e5d38f3 (patch) | |
| tree | 45f435b11108781fca3489f3c7f02279ca274f44 /liba52 | |
| parent | 1d0ab0131227d9e34b7e9f19d6e861ad495d5441 (diff) | |
| download | mpv-d1dcbd2f87335437544484b16f933d520e5d38f3.tar.bz2 mpv-d1dcbd2f87335437544484b16f933d520e5d38f3.tar.xz | |
Remove AltiVec vector declaration compiler compatibility macros.
The original problem was that FSF and Apple gcc used a different syntax
for vector declarations, i.e. {} vs. (). Nowadays Apple gcc versions support
the standard {} syntax and versions that support {} are available on all
relevant Mac OS X versions. Thus the greater compatibility is no longer
worth cluttering the code with macros.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27350 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'liba52')
| -rw-r--r-- | liba52/imdct.c | 12 | ||||
| -rw-r--r-- | liba52/liba52_changes.diff | 14 |
2 files changed, 7 insertions, 19 deletions
diff --git a/liba52/imdct.c b/liba52/imdct.c index 4b88e6cea3..49e695a066 100644 --- a/liba52/imdct.c +++ b/liba52/imdct.c @@ -382,16 +382,10 @@ void imdct_do_512 (sample_t * data, sample_t * delay, sample_t bias) #define WORD_s2 0x18,0x19,0x1a,0x1b #define WORD_s3 0x1c,0x1d,0x1e,0x1f -#ifdef HAVE_ALTIVEC_VECTOR_BRACES -#define AVV(x...) {x} -#else -#define AVV(x...) (x) -#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) +#define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} +#define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d} -#define FOUROF(a) AVV(a,a,a,a) +#define FOUROF(a) {a,a,a,a} // vcprmle is used to keep the same index as in the SSE version. // it's the same as vcprm, with the index inversed diff --git a/liba52/liba52_changes.diff b/liba52/liba52_changes.diff index 3c67c0d0fd..1a7451902c 100644 --- a/liba52/liba52_changes.diff +++ b/liba52/liba52_changes.diff @@ -1542,7 +1542,7 @@ { int i, k; sample_t t_r, t_i, a_r, a_i, b_r, b_i, w_1, w_2; -@@ -285,6 +365,707 @@ +@@ -285,6 +365,701 @@ } } @@ -1563,16 +1563,10 @@ +#define WORD_s2 0x18,0x19,0x1a,0x1b +#define WORD_s3 0x1c,0x1d,0x1e,0x1f + -+#ifdef HAVE_ALTIVEC_VECTOR_BRACES -+#define AVV(x...) {x} -+#else -+#define AVV(x...) (x) -+#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) ++#define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} ++#define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d} + -+#define FOUROF(a) AVV(a,a,a,a) ++#define FOUROF(a) {a,a,a,a} + +// vcprmle is used to keep the same index as in the SSE version. +// it's the same as vcprm, with the index inversed |