commit c2d3871501dab4bd22ad82788f283c5518471ae9
author Sarah Parker <sarahparker@google.com> Tue Jan 24 15:15:41 2017 -0800
committer Sarah Parker <sarahparker@google.com> Tue Jan 31 17:59:51 2017 +0000
tree 6892b9b2174507524412097f2326289660b3ddad
parent c6733fb7f0a90f815246d6de92e8521c5f939440

Make global_motion work with ext_inter

Change-Id: I2a490e144099d7692296992528192c1f11d2c06f

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 6751434..15cdb58 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1458,8 +1458,17 @@
     }
     case ZERO_ZEROMV: {
       assert(is_compound);
+#if CONFIG_GLOBAL_MOTION
+      mv[0].as_int = gm_get_motion_vector(&cm->global_motion[ref_frame[0]],
+                                          cm->allow_high_precision_mv)
+                         .as_int;
+      mv[1].as_int = gm_get_motion_vector(&cm->global_motion[ref_frame[1]],
+                                          cm->allow_high_precision_mv)
+                         .as_int;
+#else
       mv[0].as_int = 0;
       mv[1].as_int = 0;
+#endif  // CONFIG_GLOBAL_MOTION
       break;
     }
 #endif  // CONFIG_EXT_INTER