[FFmpeg-cvslog] avcodec/simple_idct_template: Fix strict aliasing violation
Michael Niedermayer
git at videolan.org
Sun May 8 20:43:46 CEST 2016
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun May 8 19:19:47 2016 +0200| [5df703aa1b03814e9cd216ab703501481166b3bb] | committer: Michael Niedermayer
avcodec/simple_idct_template: Fix strict aliasing violation
Fixes intrax8 test
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5df703aa1b03814e9cd216ab703501481166b3bb
---
libavcodec/simple_idct_template.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/libavcodec/simple_idct_template.c b/libavcodec/simple_idct_template.c
index 0585679..4b7fb79 100644
--- a/libavcodec/simple_idct_template.c
+++ b/libavcodec/simple_idct_template.c
@@ -118,7 +118,7 @@ static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift)
#if HAVE_FAST_64BIT
#define ROW0_MASK (0xffffLL << 48 * HAVE_BIGENDIAN)
- if (((((uint64_t *)row)[0] & ~ROW0_MASK) | ((uint64_t *)row)[1]) == 0) {
+ if (((AV_RN64A(row) & ~ROW0_MASK) | AV_RN64A(row+4)) == 0) {
uint64_t temp;
if (DC_SHIFT - extra_shift >= 0) {
temp = (row[0] * (1 << (DC_SHIFT - extra_shift))) & 0xffff;
@@ -127,14 +127,14 @@ static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift)
}
temp += temp * (1 << 16);
temp += temp * ((uint64_t) 1 << 32);
- ((uint64_t *)row)[0] = temp;
- ((uint64_t *)row)[1] = temp;
+ AV_WN64A(row, temp);
+ AV_WN64A(row+4, temp);
return;
}
#else
- if (!(((uint32_t*)row)[1] |
- ((uint32_t*)row)[2] |
- ((uint32_t*)row)[3] |
+ if (!(AV_RN32A(row+2) |
+ AV_RN32A(row+4) |
+ AV_RN32A(row+6) |
row[1])) {
uint32_t temp;
if (DC_SHIFT - extra_shift >= 0) {
@@ -143,8 +143,10 @@ static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift)
temp = ((row[0] + (1<<(extra_shift - DC_SHIFT-1))) >> (extra_shift - DC_SHIFT)) & 0xffff;
}
temp += temp * (1 << 16);
- ((uint32_t*)row)[0]=((uint32_t*)row)[1] =
- ((uint32_t*)row)[2]=((uint32_t*)row)[3] = temp;
+ AV_WN32A(row, temp);
+ AV_WN32A(row+2, temp);
+ AV_WN32A(row+4, temp);
+ AV_WN32A(row+6, temp);
return;
}
#endif
More information about the ffmpeg-cvslog
mailing list