libvpx: Pull from upstream

source/libvpx/vp8/encoder/pickinter.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 576 matching lines @@
     int rate;
     int rate2;
     int distortion2;
     int bestsme = INT_MAX;
     int best_mode_index = 0;
     unsigned int sse = INT_MAX, best_rd_sse = INT_MAX;
 #if CONFIG_TEMPORAL_DENOISING
     unsigned int zero_mv_sse = INT_MAX, best_sse = INT_MAX;
 #endif
 
+    int sf_improved_mv_pred = cpi->sf.improved_mv_pred;
     int_mv mvp;
 
     int near_sadidx[8] = {0, 1, 2, 3, 4, 5, 6, 7};
     int saddone=0;
     /* search range got from mv_pred(). It uses step_param levels. (0-7) */
     int sr=0;
 
     unsigned char *plane[4][3];
     int ref_frame_map[4];
     int sign_bias = 0;
@@ skipping 268 matching lines @@
 
             /* Further step/diamond searches as necessary */
             step_param = cpi->sf.first_step + speed_adjust;
 
 #if CONFIG_MULTI_RES_ENCODING
             /* If lower-res drops this frame, then higher-res encoder does
                motion search without any previous knowledge. Also, since
                last frame motion info is not stored, then we can not
                use improved_mv_pred. */
             if (cpi->oxcf.mr_encoder_id && !parent_ref_valid)
-                cpi->sf.improved_mv_pred = 0;
+                sf_improved_mv_pred = 0;
 
             if (parent_ref_valid && parent_ref_frame)
             {
                 /* Use parent MV as predictor. Adjust search range
                  * accordingly.
                  */
                 mvp.as_int = parent_ref_mv.as_int;
                 mvp_full.as_mv.col = parent_ref_mv.as_mv.col>>3;
                 mvp_full.as_mv.row = parent_ref_mv.as_mv.row>>3;
 
                 if(dissim <=32) step_param += 3;
                 else if(dissim <=128) step_param += 2;
                 else step_param += 1;
             }else
 #endif
             {
-                if(cpi->sf.improved_mv_pred)
+                if(sf_improved_mv_pred)
                 {
                     if(!saddone)
                     {
                         vp8_cal_sad(cpi,xd,x, recon_yoffset ,&near_sadidx[0] );
                         saddone = 1;
                     }
 
                     vp8_mv_pred(cpi, &x->e_mbd, x->e_mbd.mode_info_context,
                                 &mvp,x->e_mbd.mode_info_context->mbmi.ref_frame,
                                 cpi->common.ref_frame_sign_bias, &sr,
@@ skipping 373 matching lines @@
     error4x4 = pick_intra4x4mby_modes(x, &rate,
                                       &best_sse);
     if (error4x4 < error16x16)
     {
         xd->mode_info_context->mbmi.mode = B_PRED;
         best_rate = rate;
     }
 
     *rate_ = best_rate;
 }