Merge "rdopt: clear maybe-uninitialized variable warning" into nextgenv2
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;