summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Nagy <attilanagy@google.com>2011-01-17 13:00:08 +0200
committerAttila Nagy <attilanagy@google.com>2011-01-25 15:55:02 +0200
commit3bf235a4c92efdd622c59a622ab03dd081012089 (patch)
tree61335fbfa8f47e45598192a73343f115b1620c2d
parent339c512762542995d51086e1990cf47967687bb5 (diff)
downloadlibvpx-3bf235a4c92efdd622c59a622ab03dd081012089.tar
libvpx-3bf235a4c92efdd622c59a622ab03dd081012089.tar.gz
libvpx-3bf235a4c92efdd622c59a622ab03dd081012089.tar.bz2
libvpx-3bf235a4c92efdd622c59a622ab03dd081012089.zip
Fix issue 262, vp8cx_pack_tokens_into_partitions_armv5
http://code.google.com/p/webm/issues/detail?id=262 Function was asuming that partitions have equal amount of mb_rows, which is not always true. Change-Id: I59ed40117fd408392a85c633beeb5340ed2f4b25
-rw-r--r--vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm2
1 files changed, 2 insertions, 0 deletions
diff --git a/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm b/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
index 57cd318ee..42dae13de 100644
--- a/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
+++ b/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
@@ -65,6 +65,8 @@
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
+ ; mb_rows starts at i
str r5, [sp, #12]
; Reset all of the VP8 Writer data for each partition that