Merge "Fix: vp8cx_pack_tokens_into_partitions_armv5 crash"

This commit is contained in:
Johann 2011-10-17 09:21:31 -07:00 committed by Gerrit Code Review
commit 8d00562fba

View File

@ -65,7 +65,7 @@
numparts_loop
ldr r10, [sp, #40] ; ptr
ldr r5, [sp, #36] ; move mb_rows to the counting section
sub r5, r5, r11 ; move start point with each partition
subs r5, r5, r11 ; move start point with each partition
; mb_rows starts at i
str r5, [sp, #12]
@ -80,6 +80,8 @@ numparts_loop
str r2, [r0, #vp8_writer_pos]
str r10, [r0, #vp8_writer_buffer]
ble end_partition ; if (mb_rows <= 0) end partition
mb_row_loop
ldr r1, [r7, #tokenlist_start]
@ -344,6 +346,7 @@ check_p_lt_stop
str r6, [sp, #12]
bgt mb_row_loop
end_partition
mov r12, #32
stop_encode_loop