commit 8d486ae1d06f728b04300511e791b053a55c447d
author Luc Trudeau <luc@trud.ca> Thu May 25 13:39:38 2017 -0400
committer Luc Trudeau <luc@trud.ca> Thu May 25 19:34:15 2017 +0000
tree 29e9e2f8a1317730946d327d072922965a8096de
parent a1f80e317f1d80e66cd5d59d33e21c45b45a8169

Simplify Frame Context for cfl_read_intra

Change-Id: I9e0967662f2ed855813b968d5afd09f6d9fc1b62

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 738fde2..81d3dcc 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1095,13 +1095,8 @@
 #if CONFIG_CFL
     // TODO(ltrudeau) support PALETTE
     if (mbmi->uv_mode == DC_PRED) {
-      mbmi->cfl_alpha_idx = read_cfl_alphas(
-#if CONFIG_EC_ADAPT
-          xd->tile_ctx,
-#else
-          cm->fc,
-#endif  // CONFIG_EC_ADAPT
-          r, mbmi->skip, mbmi->cfl_alpha_signs);
+      mbmi->cfl_alpha_idx =
+          read_cfl_alphas(ec_ctx, r, mbmi->skip, mbmi->cfl_alpha_signs);
     }
 #endif  // CONFIG_CFL