diff options
| author | Johann <johannkoenig@google.com> | 2011-10-27 11:17:54 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2011-10-27 11:17:54 -0700 |
| commit | cd1ef53d12aebfead151fda9d45449ddfda07a39 (patch) | |
| tree | 1d86d69f0a6a8d2589ccc52a296a2e102e71f583 | |
| parent | 0db5599957cc69f50711c97c4154fbf5cf31f719 (diff) | |
| parent | 9452dce1811625b36aa5d5f2827991b3e46a4552 (diff) | |
| download | libvpx-cd1ef53d12aebfead151fda9d45449ddfda07a39.tar libvpx-cd1ef53d12aebfead151fda9d45449ddfda07a39.tar.gz libvpx-cd1ef53d12aebfead151fda9d45449ddfda07a39.tar.bz2 libvpx-cd1ef53d12aebfead151fda9d45449ddfda07a39.zip | |
Merge "Fix ARM build problem introduced by CL I3fab6f2b"
| -rw-r--r-- | vp8/encoder/arm/armv5te/boolhuff_armv5te.asm | 3 | ||||
| -rw-r--r-- | vp8/encoder/asm_enc_offsets.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm b/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm index 138ed46de..30513f912 100644 --- a/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm +++ b/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm @@ -24,8 +24,9 @@ ; r0 BOOL_CODER *br ; r1 unsigned char *source - +; r2 unsigned char *source_end |vp8_start_encode| PROC + str r2, [r0, #vp8_writer_buffer_end] mov r12, #0 mov r3, #255 mvn r2, #23 diff --git a/vp8/encoder/asm_enc_offsets.c b/vp8/encoder/asm_enc_offsets.c index c79e915f8..d05dab47c 100644 --- a/vp8/encoder/asm_enc_offsets.c +++ b/vp8/encoder/asm_enc_offsets.c @@ -49,6 +49,7 @@ DEFINE(vp8_writer_value, offsetof(vp8_writer, value)); DEFINE(vp8_writer_count, offsetof(vp8_writer, count)); DEFINE(vp8_writer_pos, offsetof(vp8_writer, pos)); DEFINE(vp8_writer_buffer, offsetof(vp8_writer, buffer)); +DEFINE(vp8_writer_buffer_end, offsetof(vp8_writer, buffer_end)); DEFINE(tokenextra_token, offsetof(TOKENEXTRA, Token)); DEFINE(tokenextra_extra, offsetof(TOKENEXTRA, Extra)); |