shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix ARM build problem introduced by CL I3fab6f2b"

--- 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

--- a/vp8/encoder/asm_enc_offsets.c

+++ b/vp8/encoder/asm_enc_offsets.c

@@ -49,6 +49,7 @@

 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));