From: Alex Converse <aconverse@google.com>
Date: Tue, 18 Feb 2014 23:56:07 +0000 (-0800)
Subject: Do not use the value of 'rate_mv' if uninitialized.
X-Git-Tag: v1.4.0~2327^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ceaf10e07dd07a242c532259b310948ce3321df;p=libvpx

Do not use the value of 'rate_mv' if uninitialized.

This happens when exiting single_motion_search() early due to adaptive_motion_search.

Change-Id: Ic396e7e31e59ff219bb66a459c873c9e5b17400d
---

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index a3e879b82..07ef0ff77 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2708,6 +2708,8 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
       int_mv tmp_mv;
       single_motion_search(cpi, x, tile, bsize, mi_row, mi_col,
                            &tmp_mv, &rate_mv);
+      if (tmp_mv.as_int == INVALID_MV)
+        return INT64_MAX;
       *rate2 += rate_mv;
       frame_mv[refs[0]].as_int =
           xd->mi_8x8[0]->bmi[0].as_mv[0].as_int = tmp_mv.as_int;