Merge "Refactor inter mode rate-distortion search"

diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge

diff --cc vp9/encoder/vp9_rdopt.c
index a5243096a84f93b135e7bbe3f7e872c1d36b239b,01e81ef4b3680c95ade1077439e55aad24e3f3a5..b843edfcdce37c273d613f508939d388887ff130
--- 1/vp9/encoder/vp9_rdopt.c
--- 2/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@@ -3171,14 -3172,9 +3172,9 @@@ int64_t vp9_rd_pick_inter_mode_sb(VP9_C
    unsigned char best_zcoeff_blk[256] = { 0 };
  
    x->skip_encode = cpi->sf.skip_encode_frame && xd->q_index < QIDX_SKIP_THRESH;
 -  vpx_memset(x->zcoeff_blk, 0, sizeof(x->zcoeff_blk));
 -  vpx_memset(ctx->zcoeff_blk, 0, sizeof(ctx->zcoeff_blk));
 +  vp9_zero(x->zcoeff_blk);
 +  vp9_zero(ctx->zcoeff_blk);
  
-   for (i = 0; i < 4; i++) {
-     int j;
-     for (j = 0; j < MAX_REF_FRAMES; j++)
-       seg_mvs[i][j].as_int = INVALID_MV;
-   }
    // Everywhere the flag is set the error is much higher than its neighbors.
    ctx->frames_with_high_error = 0;
    ctx->modes_with_high_error = 0;