[x264-devel] Fix overflow in ARM NEON i16x16 planar pred

[Mans Rullgard]

x264 | branch: master | Mans Rullgard <mans at mansr.com> | Thu Feb  3 13:32:06 2011 -0800| [aaa7525cc47aa58ae8f03097f2dbbbebaf326f45] | committer: Jason Garrett-Glaser

Fix overflow in ARM NEON i16x16 planar pred
Patch backported from ffmpeg.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=aaa7525cc47aa58ae8f03097f2dbbbebaf326f45
---

 common/arm/predict-a.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/arm/predict-a.S b/common/arm/predict-a.S
index fbcb8da..574653e 100644
--- a/common/arm/predict-a.S
+++ b/common/arm/predict-a.S
@@ -444,8 +444,8 @@ function x264_predict_16x16_p_neon
     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