commit 772cb136ada612d57a57186c766d083ee8d0886b
author Jingning Han <jingning@google.com> Thu Sep 21 10:54:15 2017 -0700
committer Jingning Han <jingning@google.com> Thu Sep 21 21:40:07 2017 +0000
tree a03ee5357b776ac4c5ae32b101f2696014ac5e0c
parent fce358f2493447dbf729b75a74d41016f9ad2c52

Fix compiler error when dist-8x8

Fix a compiler error when both DISABLE_TRELLISQ_SEARCH and dist-8x8
are turned on.

Change-Id: Idd122cb4fc391c449bfcd17ec8406d72ef92d15d

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 891596c..019e1f5 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1984,7 +1984,7 @@
 #endif
   int64_t rd1, rd2, rd;
   RD_STATS this_rd_stats;
-#if CONFIG_DIST_8X8 && !DISABLE_TRELLISQ_SEARCH
+#if CONFIG_DIST_8X8
   int sub8x8tx_in_gte8x8blk_in_plane0 =
       plane == 0 && plane_bsize >= BLOCK_8X8 &&
       (tx_size == TX_4X4 || tx_size == TX_4X8 || tx_size == TX_8X4);