commit d6ea71cf73646f8355f58fa2fc08edc72ff87931
author Yaowu Xu <yaowu@google.com> Mon Nov 07 10:24:14 2016 -0800
committer Yaowu Xu <yaowu@google.com> Mon Nov 07 10:35:55 2016 -0800
tree c0a044298e009aef33cc7618fa96b73cb5f20e04
parent 00a0e010f70c06e6b1f7473aee8e1034370db09e

Resolve merge issues with --enable-pvq

This commit resolves some compiling issues due to merge.

Change-Id: I0eef8aa36c404e185e0b0004948a49307c360d3e

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index c0abb68..9e5419f 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -68,7 +68,6 @@
 #endif
 #endif
 
-
 #if CONFIG_EXT_REFS
 
 #define LAST_FRAME_MODE_MASK                                      \
@@ -1031,7 +1030,7 @@
     tran_low_t *const coeff = BLOCK_OFFSET(p->coeff, block);
     tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
 #if CONFIG_PVQ
-  tran_low_t *ref_coeff = BLOCK_OFFSET(pd->pvq_ref_coeff, block);
+    tran_low_t *ref_coeff = BLOCK_OFFSET(pd->pvq_ref_coeff, block);
 #endif
 #if CONFIG_AOM_HIGHBITDEPTH
     const int bd = (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) ? xd->bd : 8;