commit adb28aaf3760c9bf217bb2bcc2596f698e734a80
author Sarah Parker <sarahparker@google.com> Mon Apr 03 11:04:57 2017 -0700
committer Sarah Parker <sarahparker@google.com> Mon Apr 03 11:12:09 2017 -0700
tree 52aa9bc8bbcdf6090c39ee26c3219ca5b44e68ae
parent 9c1d2440e57992815332b97e2e46f59014e90dc0

Fix compiler errors with motion-var + ncobmc

Change-Id: Idae4934424b3e0c2de659e3f55ea6a47b5b4ceab

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index af526cf..bbab258 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -994,9 +994,9 @@
                 plane,
 #if CONFIG_GLOBAL_MOTION
                 is_global[ref], (mi_x >> pd->subsampling_x) + x,
-                (mi_y >> pd->subsampling_y) + y, ref
+                (mi_y >> pd->subsampling_y) + y, ref,
 #endif  // CONFIG_GLOBAL_MOTION
-                                                     xd);
+                xd);
           else
 #endif  // CONFIG_EXT_INTER
             av1_make_inter_predictor(

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index b3a1244..73b6fe8 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -2432,7 +2432,7 @@
 #if CONFIG_GLOBAL_MOTION && SEPARATE_GLOBAL_MOTION
       0, xd->global_motion,
 #endif  // CONFIG_GLOBAL_MOTION && SEPARATE_GLOBAL_MOTION
-      mi);
+      xd->mi[0]);
   check_ncobmc = is_inter_block(mbmi) && motion_allowed >= OBMC_CAUSAL;
   if (!dry_run && check_ncobmc) {
     av1_check_ncobmc_rd(cpi, x, mi_row, mi_col);

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index c24820e..76857af 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -12803,7 +12803,7 @@
 #if CONFIG_GLOBAL_MOTION && SEPARATE_GLOBAL_MOTION
                            0, cm->global_motion,
 #endif  // CONFIG_GLOBAL_MOTION && SEPARATE_GLOBAL_MOTION
-                           mi);
+                           xd->mi[0]);
   av1_build_ncobmc_inter_predictors_sb(cm, xd, mi_row, mi_col);
 
   av1_subtract_plane(x, bsize, 0);