From: Jingning Han <jingning@google.com>
Date: Thu, 3 Oct 2013 19:19:53 +0000 (-0700)
Subject: Merge "Refactor inter mode rate-distortion search"
X-Git-Tag: v1.3.0~318
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a55625873f4819fbbffeba0257983c553f6534a5;p=libvpx

Merge "Refactor inter mode rate-distortion search"
---

a55625873f4819fbbffeba0257983c553f6534a5
diff --cc vp9/encoder/vp9_rdopt.c
index a5243096a,01e81ef4b..b843edfcd
--- a/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;