[xine-cvs] CVS: xine-lib/src/libffmpeg/libavcodec/ppc dsputil_altivec.c, 1.16, 1.17 float_altivec.c, 1.1, 1.2

[Miguel F. <mig...@us...>]

Update of /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/ppc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18103/src/libffmpeg/libavcodec/ppc

Modified Files:
	dsputil_altivec.c float_altivec.c 
Log Message:
another ffmpeg sync to include h264 security fixes


Index: dsputil_altivec.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/ppc/dsputil_altivec.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dsputil_altivec.c	4 Dec 2006 22:25:26 -0000	1.16
+++ dsputil_altivec.c	28 Jan 2007 18:38:35 -0000	1.17
@@ -1107,12 +1107,10 @@
       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 */     \

Index: float_altivec.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/ppc/float_altivec.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- float_altivec.c	13 Jan 2007 21:19:54 -0000	1.1
+++ float_altivec.c	28 Jan 2007 18:38:35 -0000	1.2
@@ -76,7 +76,6 @@
     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 @@
     #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 @@
             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);