From: Martin Storsjö <martin@martin.st>
Date: Thu, 15 Oct 2015 08:50:33 +0000 (+0300)
Subject: arm: Don't assume alignment in mbtree_propagate_list_internal where it isn't provided
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a2fe237af1b68f2bd53d64ed3faed62429d3ee5a;p=x264

arm: Don't assume alignment in mbtree_propagate_list_internal where it isn't provided
---

diff --git a/common/arm/mc-a.S b/common/arm/mc-a.S
index 30d1c1ad..7e5f78c7 100644
--- a/common/arm/mc-a.S
+++ b/common/arm/mc-a.S
@@ -1829,8 +1829,8 @@ function x264_mbtree_propagate_list_internal_neon
 8:
     subs            r12, r12,  #8
     vld1.16         {q14},  [r1, :128]!      @ propagate_amount
-    vld1.16         {q15},  [r2, :128]!      @ lowres_cost
-    vld1.16         {q8, q9},  [r0, :128]!
+    vld1.16         {q15},  [r2]!            @ lowres_cost
+    vld1.16         {q8, q9},  [r0]!
     vand            q15, q15, q10
     vceq.u16        q1,  q15, q10
     vmull.u16       q12, d28, d4