ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/ppc/idct_altivec.c

 /*
  * Copyright (c) 2001 Michel Lespinasse
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
@@ skipping 26 matching lines @@
 
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 #include "config.h"
 #if HAVE_ALTIVEC_H
 #include <altivec.h>
 #endif
 #include "libavcodec/dsputil.h"
 #include "types_altivec.h"
 #include "dsputil_ppc.h"
+#include "dsputil_altivec.h"
 
 #define IDCT_HALF                                       \
     /* 1st stage */                                     \
     t1 = vec_mradds (a1, vx7, vx1 );                    \
     t8 = vec_mradds (a1, vx1, vec_subs (zero, vx7));    \
     t7 = vec_mradds (a2, vx5, vx3);                     \
     t3 = vec_mradds (ma2, vx3, vx5);                    \
                                                         \
     /* 2nd stage */                                     \
     t5 = vec_adds (vx0, vx4);                           \
@@ skipping 94 matching lines @@
 
 
 static const vec_s16 constants[5] = {
     {23170, 13573,  6518, 21895, -23170, -21895,    32,    31},
     {16384, 22725, 21407, 19266,  16384,  19266, 21407, 22725},
     {22725, 31521, 29692, 26722,  22725,  26722, 29692, 31521},
     {21407, 29692, 27969, 25172,  21407,  25172, 27969, 29692},
     {19266, 26722, 25172, 22654,  19266,  22654, 25172, 26722}
 };
 
-void idct_put_altivec(uint8_t* dest, int stride, vec_s16* block)
+void idct_put_altivec(uint8_t* dest, int stride, int16_t *blk)
 {
 POWERPC_PERF_DECLARE(altivec_idct_put_num, 1);
+    vec_s16 *block = (vec_s16*)blk;
     vec_u8 tmp;
 
 #if CONFIG_POWERPC_PERF
 POWERPC_PERF_START_COUNT(altivec_idct_put_num, 1);
 #endif
     IDCT
 
 #define COPY(dest,src)                                          \
     tmp = vec_packsu (src, src);                                \
     vec_ste ((vec_u32)tmp, 0, (unsigned int *)dest);       \
     vec_ste ((vec_u32)tmp, 4, (unsigned int *)dest);
 
     COPY (dest, vx0)    dest += stride;
     COPY (dest, vx1)    dest += stride;
     COPY (dest, vx2)    dest += stride;
     COPY (dest, vx3)    dest += stride;
     COPY (dest, vx4)    dest += stride;
     COPY (dest, vx5)    dest += stride;
     COPY (dest, vx6)    dest += stride;
     COPY (dest, vx7)
 
 POWERPC_PERF_STOP_COUNT(altivec_idct_put_num, 1);
 }
 
-void idct_add_altivec(uint8_t* dest, int stride, vec_s16* block)
+void idct_add_altivec(uint8_t* dest, int stride, int16_t *blk)
 {
 POWERPC_PERF_DECLARE(altivec_idct_add_num, 1);
+    vec_s16 *block = (vec_s16*)blk;
     vec_u8 tmp;
     vec_s16 tmp2, tmp3;
     vec_u8 perm0;
     vec_u8 perm1;
     vec_u8 p0, p1, p;
 
 #if CONFIG_POWERPC_PERF
 POWERPC_PERF_START_COUNT(altivec_idct_add_num, 1);
 #endif
 
@@ skipping 19 matching lines @@
     ADD (dest, vx2, perm0)      dest += stride;
     ADD (dest, vx3, perm1)      dest += stride;
     ADD (dest, vx4, perm0)      dest += stride;
     ADD (dest, vx5, perm1)      dest += stride;
     ADD (dest, vx6, perm0)      dest += stride;
     ADD (dest, vx7, perm1)
 
 POWERPC_PERF_STOP_COUNT(altivec_idct_add_num, 1);
 }