]> granicus.if.org Git - libvpx/commitdiff
Fix tx_skip debug build.
authorAlex Converse <aconverse@google.com>
Mon, 9 Mar 2015 19:07:13 +0000 (12:07 -0700)
committerAlex Converse <aconverse@google.com>
Mon, 9 Mar 2015 21:57:13 +0000 (14:57 -0700)
Change-Id: I20a3e4e34f10485aa5e6723cd33b0311bdbf1320

vp9/encoder/vp9_rdopt.c

index c96c9f5dbeb92e29939a53daac3f0a0a15dc3793..e7e539787afda435b57da897699a234aa64369e4 100644 (file)
@@ -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