From efe2b3cbc604f39d68ae5ff876d86a6fe69650ad Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Mon, 9 Mar 2015 12:07:13 -0700 Subject: [PATCH] Fix tx_skip debug build. Change-Id: I20a3e4e34f10485aa5e6723cd33b0311bdbf1320 --- vp9/encoder/vp9_rdopt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index c96c9f5db..e7e539787 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -863,18 +863,17 @@ static void super_block_yrd(VP9_COMP *cpi, MACROBLOCK *x, int *rate, int64_t *psse, BLOCK_SIZE bs, int64_t txfm_cache[TX_MODES], int64_t ref_best_rd) { -#if !CONFIG_TX_SKIP MACROBLOCKD *xd = &x->e_mbd; -#endif int64_t sse; int64_t *ret_sse = psse ? psse : &sse; assert(bs == xd->mi[0].src_mi->mbmi.sb_type); #if CONFIG_TX_SKIP + (void) xd; if (cpi->sf.tx_size_search_method == USE_LARGESTALL #if CONFIG_PALETTE - || x->e_mbd.mi[0].src_mi->mbmi.palette_enabled + || xd->mi[0].src_mi->mbmi.palette_enabled #endif // CONFIG_PALETTE ) { #else -- 2.40.0