aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2017-01-10 00:15:17 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-01-14 21:13:37 +0100
commit656d910981b6c9fea6a34dffab37f951a661af44 (patch)
treee024b0a179341478a1d48a59fdf7d85e9dd0c307
parent8b11a89c06b94632d545f67ca508bd9c05c435ac (diff)
downloadffmpeg-656d910981b6c9fea6a34dffab37f951a661af44.tar.gz
arm: vp9mc: Fix vertical alignment of operands
This is cherrypicked from libav commit c536e5e8698110c139b1c17938998a5547550aa3. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/arm/vp9mc_neon.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/arm/vp9mc_neon.S b/libavcodec/arm/vp9mc_neon.S
index 5fe30243db..83235ff23f 100644
--- a/libavcodec/arm/vp9mc_neon.S
+++ b/libavcodec/arm/vp9mc_neon.S
@@ -79,7 +79,7 @@ function ff_vp9_avg32_neon, export=1
vrhadd.u8 q0, q0, q2
vrhadd.u8 q1, q1, q3
subs r12, r12, #1
- vst1.8 {q0, q1}, [r0, :128], r1
+ vst1.8 {q0, q1}, [r0, :128], r1
bne 1b
bx lr
endfunc
@@ -407,7 +407,7 @@ function ff_vp9_\type\()_\filter\()\size\()_h_neon, export=1
add r12, r12, 256*\offset
cmp r5, #8
add r12, r12, r5, lsl #4
- mov r5, #\size
+ mov r5, #\size
.if \size >= 16
bge \type\()_8tap_16h_34
b \type\()_8tap_16h_43
@@ -541,7 +541,7 @@ function \type\()_8tap_8v_\idx1\idx2
sub r2, r2, r3
vld1.16 {q0}, [r12, :128]
1:
- mov r12, r4
+ mov r12, r4
loadl q5, q6, q7
loadl q8, q9, q10, q11