libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_encodemv.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 523 matching lines @@
                  VP9_NMV_UPDATE_PROB);
     }
   }
 }
 
 void vp9_encode_mv(vp9_writer* w, const MV* mv, const MV* ref,
                    const nmv_context* mvctx, int usehp) {
   const MV diff = {mv->row - ref->row,
                    mv->col - ref->col};
   const MV_JOINT_TYPE j = vp9_get_mv_joint(&diff);
-  usehp = usehp && vp9_use_nmv_hp(ref);
+  usehp = usehp && vp9_use_mv_hp(ref);
 
   write_token(w, vp9_mv_joint_tree, mvctx->joints, &vp9_mv_joint_encodings[j]);
   if (mv_joint_vertical(j))
     encode_mv_component(w, diff.row, &mvctx->comps[0], usehp);
 
   if (mv_joint_horizontal(j))
     encode_mv_component(w, diff.col, &mvctx->comps[1], usehp);
 }
 
 void vp9_build_nmv_cost_table(int *mvjoint,
@@ skipping 46 matching lines @@
     vp9_increment_nmv(&mv, &best_ref_mv->as_mv, &cpi->NMVcount,
                       x->e_mbd.allow_high_precision_mv);
     if (mbmi->ref_frame[1] > INTRA_FRAME) {
       mv.row = (mbmi->mv[1].as_mv.row - second_best_ref_mv->as_mv.row);
       mv.col = (mbmi->mv[1].as_mv.col - second_best_ref_mv->as_mv.col);
       vp9_increment_nmv(&mv, &second_best_ref_mv->as_mv, &cpi->NMVcount,
                         x->e_mbd.allow_high_precision_mv);
     }
   }
 }