Commit df081b2f authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

32 vs. 64bit bugfix by (Dave Huang (dahanc))

Originally committed as revision 1596 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4363b41d
...@@ -49,7 +49,7 @@ extern void (*add_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, ...@@ -49,7 +49,7 @@ extern void (*add_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
static inline int idct_row(DCTELEM *row) static inline int idct_row(DCTELEM *row)
{ {
int_fast32_t a0, a1, a2, a3, b0, b1, b2, b3, t; int_fast32_t a0, a1, a2, a3, b0, b1, b2, b3, t;
uint64_t l, r; uint64_t l, r, t2;
l = ldq(row); l = ldq(row);
r = ldq(row + 4); r = ldq(row + 4);
...@@ -60,12 +60,12 @@ static inline int idct_row(DCTELEM *row) ...@@ -60,12 +60,12 @@ static inline int idct_row(DCTELEM *row)
if (((l & ~0xffffUL) | r) == 0) { if (((l & ~0xffffUL) | r) == 0) {
a0 >>= ROW_SHIFT; a0 >>= ROW_SHIFT;
a0 = (uint16_t) a0; t2 = (uint16_t) a0;
a0 |= a0 << 16; t2 |= t2 << 16;
a0 |= a0 << 32; t2 |= t2 << 32;
stq(a0, row); stq(t2, row);
stq(a0, row + 4); stq(t2, row + 4);
return 1; return 1;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment