diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-31 21:38:58 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-31 21:38:58 +0200 |
commit | e8676c758a627efc1744e2084c01e832c03ed2d0 (patch) | |
tree | d2c287116454898f2cf892974e45ced6fe4ef8a8 /libavutil/ppc/float_dsp_altivec.c | |
parent | 876a663c668165e13feb7bad829d6ac034a6d416 (diff) | |
parent | 72cebae0d981dde144340cf51f3c323f01e215e5 (diff) |
Merge commit '72cebae0d981dde144340cf51f3c323f01e215e5'
* commit '72cebae0d981dde144340cf51f3c323f01e215e5':
ppc: avutil: Use the abriged vector types
Conflicts:
libavutil/ppc/float_dsp_altivec.c
libavutil/ppc/util_altivec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/ppc/float_dsp_altivec.c')
-rw-r--r-- | libavutil/ppc/float_dsp_altivec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavutil/ppc/float_dsp_altivec.c b/libavutil/ppc/float_dsp_altivec.c index 49af9f9abf..6aa3e51cef 100644 --- a/libavutil/ppc/float_dsp_altivec.c +++ b/libavutil/ppc/float_dsp_altivec.c @@ -25,7 +25,7 @@ void ff_vector_fmul_altivec(float *dst, const float *src0, const float *src1, int len) { int i; - vector float d0, d1, s, zero = (vector float)vec_splat_u32(0); + vec_f d0, d1, s, zero = (vec_f)vec_splat_u32(0); for (i = 0; i < len - 7; i += 8) { d0 = vec_ld( 0, src0 + i); s = vec_ld( 0, src1 + i); @@ -40,15 +40,15 @@ void ff_vector_fmul_altivec(float *dst, const float *src0, const float *src1, void ff_vector_fmul_window_altivec(float *dst, const float *src0, const float *src1, const float *win, int len) { - vector float zero, t0, t1, s0, s1, wi, wj; - const vector unsigned char reverse = vcprm(3, 2, 1, 0); + vec_f zero, t0, t1, s0, s1, wi, wj; + const vec_u8 reverse = vcprm(3, 2, 1, 0); int i, j; dst += len; win += len; src0 += len; - zero = (vector float)vec_splat_u32(0); + zero = (vec_f)vec_splat_u32(0); for (i = -len * 4, j = len * 4 - 16; i < 0; i += 16, j -= 16) { s0 = vec_ld(i, src0); @@ -75,7 +75,7 @@ void ff_vector_fmul_add_altivec(float *dst, const float *src0, int len) { int i; - vector float d, ss0, ss1, ss2, t0, t1, edges; + vec_f d, ss0, ss1, ss2, t0, t1, edges; for (i = 0; i < len - 3; i += 4) { t0 = vec_ld(0, dst + i); @@ -96,8 +96,8 @@ void ff_vector_fmul_reverse_altivec(float *dst, const float *src0, const float *src1, int len) { int i; - vector float d, s0, s1, h0, l0, - s2, s3, zero = (vector float) vec_splat_u32(0); + vec_f d, s0, s1, h0, l0, s2, s3; + vec_f zero = (vec_f)vec_splat_u32(0); src1 += len-4; for(i = 0; i < len - 7; i += 8) { |