update ffmpeg. trying to keep local changes (see diff_to_ffmpeg_cvs.txt), let me

know if i overlooked something.
as usual, preliminary QA: tested non debug builds and several codecs including
divx3/4/5, mpeg4, xvid, msmpeg4v3, svq1, wmv7, dv (video/audio), wma
i also enabled wmv8 by default since it worked fine with the streams i have. i'm not
sure about current state of that so we might enable it only for non-x86 users in
case of trouble.

CVS patchset: 4488
CVS date: 2003/03/26 14:43:46

1 files changed, 6 insertions, 6 deletions

diff --git a/src/libffmpeg/libavcodec/alpha/simple_idct_alpha.c b/src/libffmpeg/libavcodec/alpha/simple_idct_alpha.c
index 5ce017740..889fd2ae1 100644
--- a/src/libffmpeg/libavcodec/alpha/simple_idct_alpha.c
+++ b/src/libffmpeg/libavcodec/alpha/simple_idct_alpha.c
@@ -49,7 +49,7 @@ extern void (*add_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
 static inline int idct_row(DCTELEM *row)
 {
     int_fast32_t a0, a1, a2, a3, b0, b1, b2, b3, t;
-    uint64_t l, r;
+    uint64_t l, r, t2;
     l = ldq(row);
     r = ldq(row + 4);
 
@@ -60,12 +60,12 @@ static inline int idct_row(DCTELEM *row)
 
     if (((l & ~0xffffUL) | r) == 0) {
         a0 >>= ROW_SHIFT;
-        a0 = (uint16_t) a0;
-        a0 |= a0 << 16;
-        a0 |= a0 << 32;
+        t2 = (uint16_t) a0;
+        t2 |= t2 << 16;
+        t2 |= t2 << 32;
         
-        stq(a0, row);
-        stq(a0, row + 4);
+        stq(t2, row);
+        stq(t2, row + 4);
         return 1;
     }