summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2011-01-25 12:49:52 -0800
committerCode Review <code-review@webmproject.org>2011-01-25 12:49:52 -0800
commitaf7d23c9b4000f4cd15062be81268abbc3eb9488 (patch)
tree412a571b05b97ec4468944c0c3466dfa4aed3724
parent4e149bb447b1868f42bf17530f618dfa0e84ffe5 (diff)
parent3bf235a4c92efdd622c59a622ab03dd081012089 (diff)
downloadlibvpx-af7d23c9b4000f4cd15062be81268abbc3eb9488.tar
libvpx-af7d23c9b4000f4cd15062be81268abbc3eb9488.tar.gz
libvpx-af7d23c9b4000f4cd15062be81268abbc3eb9488.tar.bz2
libvpx-af7d23c9b4000f4cd15062be81268abbc3eb9488.zip
Merge "Fix issue 262, vp8cx_pack_tokens_into_partitions_armv5"
-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