commit a60573a006de0c7250436a942c60fd8b313e83bf
author Marco Nelissen <marcone@google.com> Fri Oct 16 20:32:36 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 16 20:32:36 2015 +0000
tree 27c52b97fc3c91be948aeac8ac7b5bc63b52e4e4
parent 94b511ec304400f2a9e9016f87a9b56e19320a7b
parent 8d60b8a256fe7715dc183ea55e6c358421b92c77

Merge "Fixed stack pointer increment in impeg2_idct.s" into mnc-dr-dev

common/arm/impeg2_idct.s

diff --git a/common/arm/impeg2_idct.s b/common/arm/impeg2_idct.s
index 22225bf..0b83b72 100644
--- a/common/arm/impeg2_idct.s
+++ b/common/arm/impeg2_idct.s
@@ -406,12 +406,12 @@
     @// Copy the input pointer to another register
     @// Step 1 : load all constants
     stmfd           sp!, {r4-r12, lr}
-    add             sp, sp, #40
-    ldr             r8, [sp, #4]        @ prediction stride
-    ldr             r7, [sp, #8]        @ destination stride
-    ldr             r6, [sp]            @ src stride
-    ldr             r12, [sp, #12]
-    ldr             r11, [sp, #16]
+
+    ldr             r8, [sp, #44]        @ prediction stride
+    ldr             r7, [sp, #48]        @ destination stride
+    ldr             r6, [sp, #40]            @ src stride
+    ldr             r12, [sp, #52]
+    ldr             r11, [sp, #56]
     mov             r6, r6, lsl #1      @ x sizeof(word16)
     add             r9, r0, r6, lsl #1  @ 2 rows
 
@@ -1197,7 +1197,7 @@
 
 
 
-    sub             sp, sp, #40
+
     ldmfd           sp!, {r4-r12, pc}