Merge "vp9_ethread: fix me consts initialization to support aq_mode=3 encoding"

diff --combined vp9/encoder/vp9_encodeframe.c
index 1fea4f3744586d6ec2c8159bd7ef6754037e2e0f,63113884a2cd179e59be1a65fe57ee6c5a06c8cf..b2b3b3a463d74f0971b7af1a4f7609546f92bd1a
--- 1/vp9/encoder/vp9_encodeframe.c
--- 2/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@@ -588,7 -588,6 +588,7 @@@ static void choose_partitioning(VP9_COM
        bsize = BLOCK_32X32;
  
      y_sad = vp9_int_pro_motion_estimation(cpi, x, bsize);
 +    x->pred_mv[LAST_FRAME] = mbmi->mv[0].as_mv;
  #endif
  
      vp9_build_inter_predictors_sb(xd, mi_row, mi_col, BLOCK_64X64);
@@@ -3767,7 -3766,7 +3767,7 @@@ static void encode_frame_internal(VP9_C
    vp9_frame_init_quantizer(cpi);
  
    vp9_initialize_rd_consts(cpi);
-   vp9_initialize_me_consts(cpi, cm->base_qindex);
+   vp9_initialize_me_consts(cpi, x, cm->base_qindex);
    init_encode_frame_mb_context(cpi);
    cm->use_prev_frame_mvs = !cm->error_resilient_mode &&
                             cm->width == cm->last_width &&