MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simple_idct_template: Fix strict aliasing violation

Browse Source 
This fixes fate-wmv8-intrax8 in certain configurations, e.g.
gcc 4.4.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Michael Niedermayer 2016-05-08 21:55:40 +03:00 committed by Martin Storsjö
parent e9443105ea
commit 283226e11c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/simple_idct_template.c
View File

@ -91,7 +91,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;
@ -100,14 +100,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) {
@ -116,8 +116,10 @@ static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift)
temp = (row[0] >> (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