[FFmpeg-cvslog] ARM: NEON: fix overflow in h264 16x16 planar pred

[Mans Rullgard]

ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sun Jan 23 20:41:59 2011 +0000| [0fc1961ecc1e9b09634923d067c5db7ee4774882] | committer: Michael Niedermayer

ARM: NEON: fix overflow in h264 16x16 planar pred

Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 78f318be59a8e6174f21c2d7c3403ef325c73011)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fc1961ecc1e9b09634923d067c5db7ee4774882
---

 libavcodec/arm/h264pred_neon.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/arm/h264pred_neon.S b/libavcodec/arm/h264pred_neon.S
index e2c69e1..63c96ee 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