libvpx: Pull from upstream

source/libvpx/vp8/encoder/mcomp.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 870 matching lines @@
     int k = -1;
     int all_in;
     int best_site = -1;
     int hex_range = 127;
     int dia_range = 8;
 
     int_mv fcenter_mv;
     fcenter_mv.as_mv.row = center_mv->as_mv.row >> 3;
     fcenter_mv.as_mv.col = center_mv->as_mv.col >> 3;
 
+    (void)mvcost;
+
     /* adjust ref_mv to make sure it is within MV range */
     vp8_clamp_mv(ref_mv, x->mv_col_min, x->mv_col_max, x->mv_row_min, x->mv_row_max);
     br = ref_mv->as_mv.row;
     bc = ref_mv->as_mv.col;
 
     /* Work out the start point for the search */
     base_offset = (unsigned char *)(base_pre + d->offset);
     this_offset = base_offset + (br * (pre_stride)) + bc;
     this_mv.as_mv.row = br;
     this_mv.as_mv.col = bc;
     bestsad = vfp->sdf(what, what_stride, this_offset, in_what_stride, UINT_MAX)
             + mvsad_err_cost(&this_mv, &fcenter_mv, mvsadcost, sad_per_bit);
 
 #if CONFIG_MULTI_RES_ENCODING
     /* Lower search range based on prediction info */
     if (search_param >= 6) goto cal_neighbors;
     else if (search_param >= 5) hex_range = 4;
     else if (search_param >= 4) hex_range = 6;
     else if (search_param >= 3) hex_range = 15;
     else if (search_param >= 2) hex_range = 31;
     else if (search_param >= 1) hex_range = 63;
 
     dia_range = 8;
+#else
+    (void)search_param;
 #endif
 
     /* hex search */
     CHECK_BOUNDS(2)
 
     if(all_in)
     {
         for (i = 0; i < 6; i++)
         {
             this_mv.as_mv.row = br + hex[i].row;
@@ skipping 1097 matching lines @@
                     ++mv_mode_cts[3][1];
                 }
             }
         }
     }
 }
 
 #endif/* END MV ref count VP8_ENTROPY_STATS stats code */
 
 #endif