From f2ced3ff5f42784efe1b1d37738a645aad3fd52a Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Thu, 3 Feb 2011 13:32:06 -0800
Subject: [PATCH] Fix overflow in ARM NEON i16x16 planar pred Patch backported
 from ffmpeg.

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

diff --git a/common/arm/predict-a.S b/common/arm/predict-a.S
index fbcb8dad..574653ea 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
-- 
2.40.0