commit 26d3e45fea7412dfddacb38646de4ee116ccf8b1
author Angie Chiang <angiebird@google.com> Fri Sep 29 17:40:02 2017 -0700
committer Angie Chiang <angiebird@google.com> Sun Oct 01 20:38:02 2017 +0000
tree fe5d2d301666af69fc6af1df69fb8a6203af776c
parent 83d72790846ce9d9b69326023e083b007fa52d95

Fix lv_map when BR_NODE is off

Change-Id: I17c2193202b7b5299c31f8387ad22409ac6f9c79

av1/encoder/block.h

diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 1b3fa38..b28848d 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -74,10 +74,12 @@
   int eob_cost[EOB_COEF_CONTEXTS][2];
   int dc_sign_cost[DC_SIGN_CONTEXTS][2];
   int base_cost[NUM_BASE_LEVELS][COEFF_BASE_CONTEXTS][2];
-  int lps_cost[LEVEL_CONTEXTS][COEFF_BASE_RANGE + 1];
 #if BR_NODE
+  int lps_cost[LEVEL_CONTEXTS][COEFF_BASE_RANGE + 1];
   int br_cost[BASE_RANGE_SETS][LEVEL_CONTEXTS][2];
-#endif
+#else   // BR_NODE
+  int lps_cost[LEVEL_CONTEXTS][2];
+#endif  // BR_NODE
 #if CONFIG_CTX1D
   int eob_mode_cost[TX_CLASSES][2];
   int empty_line_cost[TX_CLASSES][EMPTY_LINE_CONTEXTS][2];