aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-01-23 20:41:59 +0000
committerMans Rullgard <mans@mansr.com>2011-01-24 14:59:46 +0000
commit78f318be59a8e6174f21c2d7c3403ef325c73011 (patch)
treeab8cdbd11e9f3ba778ced291369f4fadd04dad2d
parent5f3b8314a4a9120e0c6d6f153168c37eb849dbe8 (diff)
downloadffmpeg-78f318be59a8e6174f21c2d7c3403ef325c73011.tar.gz
ARM: NEON: fix overflow in h264 16x16 planar pred
Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--libavcodec/arm/h264pred_neon.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/h264pred_neon.S b/libavcodec/arm/h264pred_neon.S
index e2c69e1054..63c96ee725 100644
--- a/libavcodec/arm/h264pred_neon.S
+++ b/libavcodec/arm/h264pred_neon.S
@@ -131,8 +131,8 @@ function ff_pred16x16_plane_neon, export=1
vadd.i16 d5, d6, d7
vpadd.i16 d4, d4, d5
vpadd.i16 d4, d4, d4
- vshl.i16 d5, d4, #2
- vaddl.s16 q2, d4, d5
+ vshll.s16 q3, d4, #2
+ vaddw.s16 q2, q3, d4
vrshrn.s32 d4, q2, #6
mov r3, #0
vtrn.16 d4, d5