diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:25:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:25:57 +0100 |
| commit | 5dd97d5809ad510a21688e2a6d21655cc67d21ef (patch) | |
| tree | 5a57cf82c97ad68ab488231e43480612de751d98 | |
| parent | 27cab16ce71935e7186fff8e23b5f374b4c649bb (diff) | |
| parent | db3f61a04f1f66746660f921bb2780ddf1141f3b (diff) | |
| download | ffmpeg-5dd97d5809ad510a21688e2a6d21655cc67d21ef.tar.gz | |
Merge commit 'db3f61a04f1f66746660f921bb2780ddf1141f3b'
* commit 'db3f61a04f1f66746660f921bb2780ddf1141f3b':
x86: dsputil_init: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/dsputil_init.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index fea0de85a0..4e518ad56d 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -182,8 +182,8 @@ static void OPNAME ## qpel8_mc11_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[8 + 9]; \ - uint8_t *const halfH = ((uint8_t *) half) + 64; \ - uint8_t *const halfHV = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half + 64; \ + uint8_t *const halfHV = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ stride, 9); \ ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, 8, \ @@ -197,8 +197,8 @@ static void OPNAME ## qpel8_mc31_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[8 + 9]; \ - uint8_t *const halfH = ((uint8_t *) half) + 64; \ - uint8_t *const halfHV = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half + 64; \ + uint8_t *const halfHV = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ stride, 9); \ ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8, \ @@ -212,8 +212,8 @@ static void OPNAME ## qpel8_mc13_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[8 + 9]; \ - uint8_t *const halfH = ((uint8_t *) half) + 64; \ - uint8_t *const halfHV = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half + 64; \ + uint8_t *const halfHV = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ stride, 9); \ ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, 8, \ @@ -227,8 +227,8 @@ static void OPNAME ## qpel8_mc33_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[8 + 9]; \ - uint8_t *const halfH = ((uint8_t *) half) + 64; \ - uint8_t *const halfHV = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half + 64; \ + uint8_t *const halfHV = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ stride, 9); \ ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8, \ @@ -242,8 +242,8 @@ static void OPNAME ## qpel8_mc21_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[8 + 9]; \ - uint8_t *const halfH = ((uint8_t *) half) + 64; \ - uint8_t *const halfHV = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half + 64; \ + uint8_t *const halfHV = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ stride, 9); \ ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8);\ @@ -255,8 +255,8 @@ static void OPNAME ## qpel8_mc23_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[8 + 9]; \ - uint8_t *const halfH = ((uint8_t *) half) + 64; \ - uint8_t *const halfHV = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half + 64; \ + uint8_t *const halfHV = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ stride, 9); \ ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8);\ @@ -268,7 +268,7 @@ static void OPNAME ## qpel8_mc12_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[8 + 9]; \ - uint8_t *const halfH = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ stride, 9); \ ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, \ @@ -281,7 +281,7 @@ static void OPNAME ## qpel8_mc32_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[8 + 9]; \ - uint8_t *const halfH = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ stride, 9); \ ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8, \ @@ -294,7 +294,7 @@ static void OPNAME ## qpel8_mc22_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[9]; \ - uint8_t *const halfH = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ stride, 9); \ ff_ ## OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(dst, halfH, \ @@ -369,8 +369,8 @@ static void OPNAME ## qpel16_mc11_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[16 * 2 + 17 * 2]; \ - uint8_t *const halfH = ((uint8_t *) half) + 256; \ - uint8_t *const halfHV = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half + 256; \ + uint8_t *const halfHV = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ stride, 17); \ ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16, \ @@ -385,8 +385,8 @@ static void OPNAME ## qpel16_mc31_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[16 * 2 + 17 * 2]; \ - uint8_t *const halfH = ((uint8_t *) half) + 256; \ - uint8_t *const halfHV = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half + 256; \ + uint8_t *const halfHV = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ stride, 17); \ ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16, \ @@ -401,8 +401,8 @@ static void OPNAME ## qpel16_mc13_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[16 * 2 + 17 * 2]; \ - uint8_t *const halfH = ((uint8_t *) half) + 256; \ - uint8_t *const halfHV = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half + 256; \ + uint8_t *const halfHV = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ stride, 17); \ ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16, \ @@ -417,8 +417,8 @@ static void OPNAME ## qpel16_mc33_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[16 * 2 + 17 * 2]; \ - uint8_t *const halfH = ((uint8_t *) half) + 256; \ - uint8_t *const halfHV = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half + 256; \ + uint8_t *const halfHV = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ stride, 17); \ ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16, \ @@ -433,8 +433,8 @@ static void OPNAME ## qpel16_mc21_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[16 * 2 + 17 * 2]; \ - uint8_t *const halfH = ((uint8_t *) half) + 256; \ - uint8_t *const halfHV = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half + 256; \ + uint8_t *const halfHV = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ stride, 17); \ ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH, \ @@ -447,8 +447,8 @@ static void OPNAME ## qpel16_mc23_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[16 * 2 + 17 * 2]; \ - uint8_t *const halfH = ((uint8_t *) half) + 256; \ - uint8_t *const halfHV = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half + 256; \ + uint8_t *const halfHV = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ stride, 17); \ ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH, \ @@ -461,7 +461,7 @@ static void OPNAME ## qpel16_mc12_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[17 * 2]; \ - uint8_t *const halfH = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ stride, 17); \ ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16, \ @@ -474,7 +474,7 @@ static void OPNAME ## qpel16_mc32_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[17 * 2]; \ - uint8_t *const halfH = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ stride, 17); \ ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16, \ @@ -487,7 +487,7 @@ static void OPNAME ## qpel16_mc22_ ## MMX(uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ uint64_t half[17 * 2]; \ - uint8_t *const halfH = ((uint8_t *) half); \ + uint8_t *const halfH = (uint8_t *) half; \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ stride, 17); \ ff_ ## OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(dst, halfH, \ |