ref: 8b15cf69290ca658d921266fe8fc92861ed5f4ab
parent: 3df4436e1ac98b3ca2b92473b5ac222667a96edd
parent: 3f8349467af86c3d1f0b5ca4bc6284bee0e4dbb7
author: John Koleszar <jkoleszar@google.com>
date: Thu Mar 29 10:03:07 EDT 2012
Merge "remove unused BOOL_CODER::value"
--- a/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm
+++ b/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm
@@ -47,7 +47,6 @@
mvn r2, #23
str r12, [r0, #vp8_writer_lowvalue]
str r3, [r0, #vp8_writer_range]
- str r12, [r0, #vp8_writer_value]
str r2, [r0, #vp8_writer_count]
str r12, [r0, #vp8_writer_pos]
str r1, [r0, #vp8_writer_buffer]
--- a/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
+++ b/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
@@ -90,7 +90,6 @@
mov r5, #255 ; vp8_writer_range
mvn r3, #23 ; vp8_writer_count
- str r2, [r0, #vp8_writer_value]
str r2, [r0, #vp8_writer_pos]
str r10, [r0, #vp8_writer_buffer]
--- a/vp8/encoder/asm_enc_offsets.c
+++ b/vp8/encoder/asm_enc_offsets.c
@@ -45,7 +45,6 @@
/* pack tokens */
DEFINE(vp8_writer_lowvalue, offsetof(vp8_writer, lowvalue));
DEFINE(vp8_writer_range, offsetof(vp8_writer, range));
-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));
--- a/vp8/encoder/boolhuff.c
+++ b/vp8/encoder/boolhuff.c
@@ -45,7 +45,6 @@
br->lowvalue = 0;
br->range = 255;
- br->value = 0;
br->count = -24;
br->buffer = source;
br->buffer_end = source_end;
--- a/vp8/encoder/boolhuff.h
+++ b/vp8/encoder/boolhuff.h
@@ -26,7 +26,6 @@
{
unsigned int lowvalue;
unsigned int range;
- unsigned int value;
int count;
unsigned int pos;
unsigned char *buffer;
--
⑨