commit eb311a231bc8a10d4dfc0e5f0f830ed5cd258558
author Yaowu Xu <yaowu@google.com> Wed Nov 30 08:24:15 2016 -0800
committer Yaowu Xu <yaowu@google.com> Wed Nov 30 17:44:47 2016 +0000
tree 06d5218665ff1ea20fc9001632cacc0ae7054ca3
parent b79424e9733cfd9af7ace5a8f98fa28490e2c679

Fix build for --enable-pvq

commit#f030558 made change in call to av1_xform_quant() that requires
coeff_ctx to be defined always.

Change-Id: Ia169ef7ec55c4600e60db513321dc9beb773ede9

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 27db8f6..195f3d3 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1173,10 +1173,8 @@
   MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
   const AV1_COMMON *cm = &args->cpi->common;
   int64_t rd1, rd2, rd;
-#if !CONFIG_PVQ
   int coeff_ctx = combine_entropy_contexts(*(args->t_above + blk_col),
                                            *(args->t_left + blk_row));
-#endif
   RD_STATS this_rd_stats;
   av1_init_rd_stats(&this_rd_stats);