Merge "Fix in handling wrong cu_qp_delta" into lmp-dev am: 98f9e26d24 am: 10f2b105f5 am: b4ddce56d1 am: 59b232588b am: ca85c43d8d am: fc093b18cd
am: 4f28fb5344
Change-Id: If74f86a089ab5a093387c6a1e9708961ff8cf4fc
diff --git a/common/arm/ihevc_itrans_recon_8x8.s b/common/arm/ihevc_itrans_recon_8x8.s
index 440512a..e9b53b4 100644
--- a/common/arm/ihevc_itrans_recon_8x8.s
+++ b/common/arm/ihevc_itrans_recon_8x8.s
@@ -151,12 +151,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
@@ -925,7 +925,7 @@
- sub sp,sp,#40
+
ldmfd sp!,{r4-r12,pc}
diff --git a/decoder.x86.mk b/decoder.x86.mk
index 287ef3a..3f86923 100644
--- a/decoder.x86.mk
+++ b/decoder.x86.mk
@@ -40,5 +40,6 @@
LOCAL_C_INCLUDES_x86 += $(libhevcd_inc_dir_x86)
LOCAL_CFLAGS_x86 += $(libhevcd_cflags_x86)
-
+# Bug: 25132373
+LOCAL_CLANG := false
