diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-10-22 16:52:28 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-10-22 16:58:57 -0700 |
| commit | 04d62a989bcd2c32be546e4f5129171f9ff0b037 (patch) | |
| tree | 4e673a664b229360252ae20b6950c27a9aa86f58 /vp8/encoder/onyx_int.h | |
| parent | 78808ad9fb101cbd06652b383f94f4409f2eba2d (diff) | |
| download | libvpx-04d62a989bcd2c32be546e4f5129171f9ff0b037.tar libvpx-04d62a989bcd2c32be546e4f5129171f9ff0b037.tar.gz libvpx-04d62a989bcd2c32be546e4f5129171f9ff0b037.tar.bz2 libvpx-04d62a989bcd2c32be546e4f5129171f9ff0b037.zip | |
Merging in the TX_SELECT experiment
Change-Id: I0d306b0062be59bc785b65882691c956c8b5e7c8
Diffstat (limited to 'vp8/encoder/onyx_int.h')
| -rw-r--r-- | vp8/encoder/onyx_int.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index 8c4f78bac..ab1bb44ec 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -451,13 +451,11 @@ typedef struct VP8_COMP { int rd_prediction_type_threshes[4][NB_PREDICTION_TYPES]; int comp_pred_count[COMP_PRED_CONTEXTS]; int single_pred_count[COMP_PRED_CONTEXTS]; -#if CONFIG_TX_SELECT // FIXME contextualize int txfm_count[TX_SIZE_MAX]; int txfm_count_8x8p[TX_SIZE_MAX - 1]; int64_t rd_tx_select_diff[NB_TXFM_MODES]; int rd_tx_select_threshes[4][NB_TXFM_MODES]; -#endif int RDMULT; int RDDIV; |