commit 70c4fab56963b532a4d63ca125559a360afcbf98
author Sarah Parker <sarahparker@google.com> Fri Nov 04 12:35:57 2016 -0700
committer James Zern <jzern@google.com> Fri Nov 04 17:56:23 2016 -0700
tree caf30be9c7313b12e192d73d6fc5862bdf3b06c4
parent 4be3214fecf0cf371183ab755bc2892f26ae565d

rdopt: clear maybe-uninitialized variable warning

av1/encoder/rdopt.c:9533 ‘zeromv[1].as_int’ may be used
uninitialized in this function [-Wmaybe-uninitialized]
this was spurious given the logic in the if

Change-Id: I8ddfe7e46d1bf5593cc8624f05c9f181243a87d4

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 2e4c5f2..eb91ffa 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9454,10 +9454,10 @@
 #endif  // CONFIG_REF_MV
 #if CONFIG_GLOBAL_MOTION
     zeromv[0].as_int = cm->global_motion[refs[0]].motion_params.wmmat[0].as_int;
-    if (comp_pred_mode) {
-      zeromv[1].as_int =
-          cm->global_motion[refs[1]].motion_params.wmmat[0].as_int;
-    }
+    zeromv[1].as_int =
+        comp_pred_mode
+            ? cm->global_motion[refs[1]].motion_params.wmmat[0].as_int
+            : 0;
 #else
     zeromv[0].as_int = 0;
     zeromv[1].as_int = 0;