ref: 8a5c255b3d019fff6c5943362a0f5b874e7b7eae
parent: bb30ffc4dca93d23200202845f606df3dfc48440
parent: c4887da39c9153151598d6a050debb11fe1f9888
author: Scott LaVarnway <slavarnway@google.com>
date: Thu Jan 27 03:12:22 EST 2011
Merge "Removed unused members from VP8_COMP"
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -2187,7 +2187,6 @@
cpi->common.error.setjmp = 1;
- CHECK_MEM_ERROR(cpi->rdtok, vpx_calloc(256 * 3 / 2, sizeof(TOKENEXTRA)));
CHECK_MEM_ERROR(cpi->mb.ss, vpx_calloc(sizeof(search_site), (MAX_MVSEARCH_STEPS * 8) + 1));
vp8_create_common(&cpi->common);
@@ -2697,7 +2696,6 @@
vp8_dealloc_compressor_data(cpi);
vpx_free(cpi->mb.ss);
vpx_free(cpi->tok);
- vpx_free(cpi->rdtok);
vpx_free(cpi->cyclic_refresh_map);
vp8_remove_common(&cpi->common);
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -304,8 +304,6 @@
YV12_BUFFER_CONFIG last_frame_uf;
- char *Dest;
-
TOKENEXTRA *tok;
unsigned int tok_count;
@@ -338,11 +336,6 @@
int RDMULT;
int RDDIV ;
- TOKENEXTRA *rdtok;
- vp8_writer rdbc;
- int intra_mode_costs[10];
-
-
CODING_CONTEXT coding_context;
// Rate targetting variables
@@ -554,8 +547,6 @@
int last_kffilt_lvl;
int ref_frame_flags;
-
- int exp[512];
SPEED_FEATURES sf;
int error_bins[1024];
--
⑨