commit 3bbcedec2f619f9524b9de1c4ae0aeae83d6f39b
author Angie Chiang <angiebird@google.com> Wed Sep 20 22:40:19 2017 +0000
committer Angie Chiang <angiebird@google.com> Wed Sep 20 22:40:19 2017 +0000
tree 8abc074c6733ca9b016ef9645fa6d4bfd35d66d3
parent 863efacc150346211e58ad918c3ba95c0e5d4aff

Revert "Fix warning about sub8x8tx_in_gte8x8blk_in_plane0"

This reverts commit 863efacc150346211e58ad918c3ba95c0e5d4aff.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I3d9efef938fe0a2ec4914adc23d0e53b873109d4

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index e29b605..019e1f5 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4522,11 +4522,6 @@
     return;
   }
 #endif  // CONFIG_MRC_TX
-#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);
-#endif  // CONFIG_DIST_8X8
   if (
 #if CONFIG_DIST_8X8
       (x->using_dist_8x8 && sub8x8tx_in_gte8x8blk_in_plane0) ||