From 7c3728d769962d288b73cc945c3143ae68726984 Mon Sep 17 00:00:00 2001
From: Miguel Freitas <miguelfreitas@users.sourceforge.net>
Date: Sun, 28 Jan 2007 18:38:32 +0000
Subject: another ffmpeg sync to include h264 security fixes

CVS patchset: 8573
CVS date: 2007/01/28 18:38:32
---
 src/libffmpeg/libavcodec/ppc/dsputil_altivec.c | 6 ++----
 src/libffmpeg/libavcodec/ppc/float_altivec.c   | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/libffmpeg/libavcodec/ppc')

diff --git a/src/libffmpeg/libavcodec/ppc/dsputil_altivec.c b/src/libffmpeg/libavcodec/ppc/dsputil_altivec.c
index 6f48893a4..bbc53d761 100644
--- a/src/libffmpeg/libavcodec/ppc/dsputil_altivec.c
+++ b/src/libffmpeg/libavcodec/ppc/dsputil_altivec.c
@@ -1107,12 +1107,10 @@ POWERPC_PERF_START_COUNT(altivec_hadamard8_diff8x8_num, 1);
       register vector signed short srcV, dstV;                          \
       register vector signed short but0, but1, but2, op1, op2, op3;     \
       src1 = vec_ld(stride * i, src);                                   \
-      if ((((stride * i) + (unsigned long)src) & 0x0000000F) > 8)       \
-        src2 = vec_ld((stride * i) + 16, src);                          \
+      src2 = vec_ld((stride * i) + 15, src);                            \
       srcO = vec_perm(src1, src2, vec_lvsl(stride * i, src));           \
       dst1 = vec_ld(stride * i, dst);                                   \
-      if ((((stride * i) + (unsigned long)dst) & 0x0000000F) > 8)       \
-        dst2 = vec_ld((stride * i) + 16, dst);                          \
+      dst2 = vec_ld((stride * i) + 15, dst);                            \
       dstO = vec_perm(dst1, dst2, vec_lvsl(stride * i, dst));           \
       /* promote the unsigned chars to signed shorts */                 \
       /* we're in the 8x8 function, we only care for the first 8 */     \
diff --git a/src/libffmpeg/libavcodec/ppc/float_altivec.c b/src/libffmpeg/libavcodec/ppc/float_altivec.c
index c6e43dec2..22c2de61a 100644
--- a/src/libffmpeg/libavcodec/ppc/float_altivec.c
+++ b/src/libffmpeg/libavcodec/ppc/float_altivec.c
@@ -76,7 +76,6 @@ static void vector_fmul_add_add_altivec(float *dst, const float *src0,
     vector unsigned char align = vec_lvsr(0,dst),
                          mask = vec_lvsl(0, dst);
 
-    t0 = vec_ld(0, dst);
 #if 0 //FIXME: there is still something wrong
     if (step == 2) {
         int y;
@@ -134,6 +133,7 @@ static void vector_fmul_add_add_altivec(float *dst, const float *src0,
     #endif
     if (step == 1 && src3 == 0)
         for (i=0; i<len-3; i+=4) {
+            t0 = vec_ld(0, dst+i);
             t1 = vec_ld(15, dst+i);
             s0 = vec_ld(0, src0+i);
             s1 = vec_ld(0, src1+i);
@@ -144,7 +144,6 @@ static void vector_fmul_add_add_altivec(float *dst, const float *src0,
             t0 = vec_perm(edges, d, align);
             vec_st(t1, 15, dst+i);
             vec_st(t0, 0, dst+i);
-            t0 = t1;
         }
     else
         ff_vector_fmul_add_add_c(dst, src0, src1, src2, src3, len, step);
-- 
cgit v1.2.3