commit 99ff89b6fbe73527b1e7e433c0c4c600d33bf7b2
author James Zern <jzern@google.com> Sat Nov 05 03:19:32 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 05 03:19:33 2016 +0000
tree f09ad3ab99a60d8e9675b64ced5e9344605fa626
parent 713b56121ae19e85c3103b4dea7eaf401278d6e4
parent 70c4fab56963b532a4d63ca125559a360afcbf98

Merge "rdopt: clear maybe-uninitialized variable warning" into nextgenv2

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index d23a7ba..947fefd 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9430,10 +9430,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;