libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_findnearmv.h

 /*
  *  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.
  */
 
 
 #ifndef VP9_COMMON_VP9_FINDNEARMV_H_
 #define VP9_COMMON_VP9_FINDNEARMV_H_
 
 #include "vp9/common/vp9_mv.h"
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_treecoder.h"
 #include "vp9/common/vp9_onyxc_int.h"
 
 /* check a list of motion vectors by sad score using a number rows of pixels
  * above and a number cols of pixels in the left to select the one with best
  * score to use as ref motion vector
  */
 void vp9_find_best_ref_mvs(MACROBLOCKD *xd,
-                           unsigned char *ref_y_buffer,
+                           uint8_t *ref_y_buffer,
                            int ref_y_stride,
                            int_mv *mvlist,
-                           int_mv *best_mv,
                            int_mv *nearest,
                            int_mv *near);
 
 static void mv_bias(int refmb_ref_frame_sign_bias, int refframe, int_mv *mvp, const int *ref_frame_sign_bias) {
   MV xmv;
   xmv = mvp->as_mv;
 
   if (refmb_ref_frame_sign_bias != ref_frame_sign_bias[refframe]) {
     xmv.row *= -1;
     xmv.col *= -1;
@@ skipping 36 matching lines @@
   return (mv->as_mv.col < mb_to_left_edge) ||
          (mv->as_mv.col > mb_to_right_edge) ||
          (mv->as_mv.row < mb_to_top_edge) ||
          (mv->as_mv.row > mb_to_bottom_edge);
 }
 
 vp9_prob *vp9_mv_ref_probs(VP9_COMMON *pc,
                            vp9_prob p[VP9_MVREFS - 1],
                            const int context);
 
-extern const unsigned char vp9_mbsplit_offset[4][16];
+extern const uint8_t vp9_mbsplit_offset[4][16];
 
 static int left_block_mv(const MODE_INFO *cur_mb, int b) {
   if (!(b & 3)) {
     /* On L edge, get from MB to left of us */
     --cur_mb;
 
     if (cur_mb->mbmi.mode != SPLITMV)
       return cur_mb->mbmi.mv[0].as_int;
     b += 4;
   }
@@ skipping 79 matching lines @@
     } else if (cur_mb->mbmi.mode == B_PRED) {
       return ((cur_mb->bmi + 12 + b)->as_mode.first);
     } else {
       return B_DC_PRED;
     }
   }
 
   return (cur_mb->bmi + b - 4)->as_mode.first;
 }
 
-#endif
+#endif  // VP9_COMMON_VP9_FINDNEARMV_H_