commit cb63767421b5c21affa5d74b22f8de053801d036
author Jingning Han <jingning@google.com> Thu Jun 22 09:14:40 2017 -0700
committer Jingning Han <jingning@google.com> Thu Jun 22 19:07:52 2017 +0000
tree 6eb4ac8b4376954f5d57f61360a6455f79c4e3bb
parent d2a74d6b0851e6a9ceef86fad35cd0a843aa33d3

Fix compiler warning in joint_motion_search

Avoid compiler warning when global-motion is off.

Change-Id: Ie6a0d3e4efc0e06b263e8c8c0c0dc153738c3804

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index fffd2d0..886fe3f 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -5264,11 +5264,11 @@
   int_mv ref_mv[2];
   int ite, ref;
   struct scale_factors sf;
-  struct macroblockd_plane *const pd = &xd->plane[0];
 #if CONFIG_GLOBAL_MOTION || CONFIG_WARPED_MOTION
   // ic and ir are the 4x4 coordiantes of the sub8x8 at index "block"
   const int ic = block & 1;
   const int ir = (block - ic) >> 1;
+  struct macroblockd_plane *const pd = &xd->plane[0];
   const int p_col = ((mi_col * MI_SIZE) >> pd->subsampling_x) + 4 * ic;
   const int p_row = ((mi_row * MI_SIZE) >> pd->subsampling_y) + 4 * ir;
 #if CONFIG_GLOBAL_MOTION