aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ppc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-27 08:55:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-27 08:55:24 +0200
commitb7c6d1ed906453d9fcd3d8ef78f68dae68ae3ed1 (patch)
tree9315f8bd1500ea292abdb49f2187b9bcd37cec87 /libavcodec/ppc
parent53ec1c811e41807a296934eb142f4aebe787e390 (diff)
parentbe7952b5c3ace9aba4a4121d7bb540ac5257594c (diff)
downloadffmpeg-b7c6d1ed906453d9fcd3d8ef78f68dae68ae3ed1.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: arm: Only output eabi attributes if building for ELF fix scalarproduct_and_madd_int16_altivec() for orders > 16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc')
-rw-r--r--libavcodec/ppc/int_altivec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ppc/int_altivec.c b/libavcodec/ppc/int_altivec.c
index 4386b13b23..1d2ee834b0 100644
--- a/libavcodec/ppc/int_altivec.c
+++ b/libavcodec/ppc/int_altivec.c
@@ -129,8 +129,8 @@ static int32_t scalarproduct_and_madd_int16_altivec(int16_t *v1, const int16_t *
pv1[0] = vec_mladd(t0, muls, i0);
pv1[1] = vec_mladd(t1, muls, i1);
pv1 += 2;
- v2 += 8;
- v3 += 8;
+ v2 += 16;
+ v3 += 16;
} while(--order);
res = vec_splat(vec_sums(res, zero_s32v), 3);
vec_ste(res, 0, &ires);