Merge "Prevent invaid memory access"

vp9/encoder/vp9_encodeframe.c

@@ -500,7 +500,7 @@ static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx,
     if (is_inter_block(mbmi) &&
         (mbmi->sb_type < BLOCK_8X8 || mbmi->mode == NEWMV)) {
       int_mv best_mv[2];
-      for (i = 0; i < 2; ++i)
+      for (i = 0; i < 1 + has_second_ref(mbmi); ++i)
         best_mv[i].as_int = mbmi->ref_mvs[mbmi->ref_frame[i]][0].as_int;
       vp9_update_mv_count(cpi, x, best_mv);
     }