]> granicus.if.org Git - libvpx/commitdiff
Do not use the value of 'rate_mv' if uninitialized.
authorAlex Converse <aconverse@google.com>
Tue, 18 Feb 2014 23:56:07 +0000 (15:56 -0800)
committerAlex Converse <aconverse@google.com>
Wed, 19 Feb 2014 01:04:42 +0000 (17:04 -0800)
This happens when exiting single_motion_search() early due to adaptive_motion_search.

Change-Id: Ic396e7e31e59ff219bb66a459c873c9e5b17400d

vp9/encoder/vp9_rdopt.c

index a3e879b821e100d32a892d1b6f8c57f056f1cfa0..07ef0ff7779832e10102d0aa876fe6336228f93c 100644 (file)
@@ -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;