commit c01cc430880ea5ee0e3d54517d0b21ca564a55e7
author Zoe Liu <zoeliu@google.com> Wed Sep 27 10:40:20 2017 -0700
committer Zoe Liu <zoeliu@google.com> Fri Sep 29 16:14:08 2017 +0000
tree 138afe3d9357dbe00b7ee5be64fac5d8b532b538
parent 3ab20b459e4595de48f2359305a0226d19e80206

Fix compiler error when convolve-round is off

Change-Id: I7dcce8c84d1a16b8b894d4292d77ae368dc44b6a

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index b9f6796..ab46d52 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -995,7 +995,6 @@
 #endif
   DECLARE_ALIGNED(16, uint8_t,
                   tmp_buf[INTER_PRED_BYTES_PER_PIXEL * MAX_SB_SQUARE]);
-  const int tmp_buf_stride = MAX_SB_SIZE;
 #undef INTER_PRED_BYTES_PER_PIXEL
 
 #if CONFIG_HIGHBITDEPTH
@@ -1009,6 +1008,7 @@
 #endif
 
 #if CONFIG_CONVOLVE_ROUND
+  const int tmp_buf_stride = MAX_SB_SIZE;
   const int is_conv_no_round = conv_params->round == CONVOLVE_OPT_NO_ROUND;
   CONV_BUF_TYPE *org_dst = conv_params->dst;
   int org_dst_stride = conv_params->dst_stride;