Merge "Use same bias (against non-zero mv for big blocks) for speed 5."

vp9/encoder/vp9_pickmode.c

@@ -1485,7 +1485,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
 
     // Bias against non-zero (above some threshold) motion for large blocks.
     // This is temporary fix to avoid selection of large mv for big blocks.
-    if (cpi->oxcf.speed > 5 &&
+    if (cpi->oxcf.speed >= 5 &&
         cpi->oxcf.content != VP9E_CONTENT_SCREEN &&
         (frame_mv[this_mode][ref_frame].as_mv.row > 64 ||
         frame_mv[this_mode][ref_frame].as_mv.row < -64 ||