Merge "Fix a unused function warning with var_tx on" into nextgenv2

vp10/decoder/decodeframe.c

@@ -466,6 +466,7 @@ static void decode_reconstruct_tx(MACROBLOCKD *const xd, vpx_reader *r,
 }
 #endif  // CONFIG_VAR_TX
 
+#if !CONFIG_VAR_TX || CONFIG_SUPERTX
 static int reconstruct_inter_block(MACROBLOCKD *const xd,
 #if CONFIG_ANS
                                    const rans_dec_lut *const token_tab,
@@ -492,6 +493,7 @@ static int reconstruct_inter_block(MACROBLOCKD *const xd,
                             pd->dst.stride, eob, block_idx);
   return eob;
 }
+#endif  // !CONFIG_VAR_TX || CONFIG_SUPER_TX
 
 #if (CONFIG_SUPERTX || CONFIG_OBMC)
 static void build_mc_border(const uint8_t *src, int src_stride,