diff options
author | Måns Rullgård <mans@mansr.com> | 2010-01-22 03:25:11 +0000 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2010-01-22 03:25:11 +0000 |
commit | c67278098def4438fc587744f5df1c147bc95dc3 (patch) | |
tree | 032a9f82fd504566b8e7361d6ea6e80cbda18c0c /libpostproc | |
parent | 27ce1be89ba765d4129a638f2dd673e1f6e17682 (diff) | |
download | ffmpeg-c67278098def4438fc587744f5df1c147bc95dc3.tar.gz |
Move array specifiers outside DECLARE_ALIGNED() invocations
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libpostproc')
-rw-r--r-- | libpostproc/postprocess_altivec_template.c | 12 | ||||
-rw-r--r-- | libpostproc/postprocess_internal.h | 4 | ||||
-rw-r--r-- | libpostproc/postprocess_template.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libpostproc/postprocess_altivec_template.c b/libpostproc/postprocess_altivec_template.c index c3c74613c2..c5851d9664 100644 --- a/libpostproc/postprocess_altivec_template.c +++ b/libpostproc/postprocess_altivec_template.c @@ -62,7 +62,7 @@ static inline int vertClassify_altivec(uint8_t src[], int stride, PPContext *c) vector by assuming (stride % 16) == 0, unfortunately this is not always true. */ - DECLARE_ALIGNED(16, short, data[8]) = + DECLARE_ALIGNED(16, short, data)[8] = { ((c->nonBQP*c->ppMode.baseDcDiff)>>8) + 1, data[0] * 2 + 1, @@ -222,7 +222,7 @@ static inline void doVertLowPass_altivec(uint8_t *src, int stride, PPContext *c) const vector signed int zero = vec_splat_s32(0); const int properStride = (stride % 16); const int srcAlign = ((unsigned long)src2 % 16); - DECLARE_ALIGNED(16, short, qp[8]) = {c->QP}; + DECLARE_ALIGNED(16, short, qp)[8] = {c->QP}; vector signed short vqp = vec_ld(0, qp); vector signed short vb0, vb1, vb2, vb3, vb4, vb5, vb6, vb7, vb8, vb9; vector unsigned char vbA0, av_uninit(vbA1), av_uninit(vbA2), av_uninit(vbA3), av_uninit(vbA4), av_uninit(vbA5), av_uninit(vbA6), av_uninit(vbA7), av_uninit(vbA8), vbA9; @@ -418,7 +418,7 @@ static inline void doVertDefFilter_altivec(uint8_t src[], int stride, PPContext */ uint8_t *src2 = src + stride*3; const vector signed int zero = vec_splat_s32(0); - DECLARE_ALIGNED(16, short, qp[8]) = {8*c->QP}; + DECLARE_ALIGNED(16, short, qp)[8] = {8*c->QP}; vector signed short vqp = vec_splat( (vector signed short)vec_ld(0, qp), 0); @@ -538,7 +538,7 @@ static inline void dering_altivec(uint8_t src[], int stride, PPContext *c) { src & stride :-( */ uint8_t *srcCopy = src; - DECLARE_ALIGNED(16, uint8_t, dt[16]); + DECLARE_ALIGNED(16, uint8_t, dt)[16]; const vector signed int zero = vec_splat_s32(0); vector unsigned char v_dt; dt[0] = deringThreshold; @@ -602,7 +602,7 @@ static inline void dering_altivec(uint8_t src[], int stride, PPContext *c) { v_avg = vec_avg(v_min, v_max); } - DECLARE_ALIGNED(16, signed int, S[8]); + DECLARE_ALIGNED(16, signed int, S)[8]; { const vector unsigned short mask1 = (vector unsigned short) {0x0001, 0x0002, 0x0004, 0x0008, @@ -698,7 +698,7 @@ static inline void dering_altivec(uint8_t src[], int stride, PPContext *c) { /* I'm not sure the following is actually faster than straight, unvectorized C code :-( */ - DECLARE_ALIGNED(16, int, tQP2[4]); + DECLARE_ALIGNED(16, int, tQP2)[4]; tQP2[0]= c->QP/2 + 1; vector signed int vQP2 = vec_ld(0, tQP2); vQP2 = vec_splat(vQP2, 0); diff --git a/libpostproc/postprocess_internal.h b/libpostproc/postprocess_internal.h index 2ab1ed84db..0344babfe5 100644 --- a/libpostproc/postprocess_internal.h +++ b/libpostproc/postprocess_internal.h @@ -143,8 +143,8 @@ typedef struct PPContext{ DECLARE_ALIGNED(8, uint64_t, pQPb); DECLARE_ALIGNED(8, uint64_t, pQPb2); - DECLARE_ALIGNED(8, uint64_t, mmxDcOffset[64]); - DECLARE_ALIGNED(8, uint64_t, mmxDcThreshold[64]); + DECLARE_ALIGNED(8, uint64_t, mmxDcOffset)[64]; + DECLARE_ALIGNED(8, uint64_t, mmxDcThreshold)[64]; QP_STORE_T *stdQPTable; ///< used to fix MPEG2 style qscale QP_STORE_T *nonBQPTable; diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c index ad8d7c0099..d02e12be16 100644 --- a/libpostproc/postprocess_template.c +++ b/libpostproc/postprocess_template.c @@ -3514,7 +3514,7 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ horizX1Filter(dstBlock-4, stride, QP); else if(mode & H_DEBLOCK){ #if HAVE_ALTIVEC - DECLARE_ALIGNED(16, unsigned char, tempBlock[272]); + DECLARE_ALIGNED(16, unsigned char, tempBlock)[272]; transpose_16x8_char_toPackedAlign_altivec(tempBlock, dstBlock - (4 + 1), stride); const int t=vertClassify_altivec(tempBlock-48, 16, &c); |