Merge "Replacing int_mv with MV and adding const qualifiers."

diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge

diff --cc vp9/encoder/vp9_encodemv.h
index 7f997ff378dddf0a63d96f42432f8c9505bae15e,eb0e24f194ee32d8d6e240db4b437bdd2550992b..f16b2c17cef0c9e893e9a92efe1dcd2f8acb1adc
--- 1/vp9/encoder/vp9_encodemv.h
--- 2/vp9/encoder/vp9_encodemv.h
+++ b/vp9/encoder/vp9_encodemv.h
@@@ -26,9 -26,10 +26,10 @@@ void vp9_encode_mv(VP9_COMP *cpi, vp9_w
                     const nmv_context* mvctx, int usehp);
  
  void vp9_build_nmv_cost_table(int *mvjoint, int *mvcost[2],
 -                              const nmv_context* const mvctx, int usehp);
 +                              const nmv_context* mvctx, int usehp);
  
- void vp9_update_mv_count(VP9_COMP *cpi, MACROBLOCK *x, int_mv best_ref_mv[2]);
+ void vp9_update_mv_count(VP9_COMMON *cm, const MACROBLOCKD *xd,
+                          const MV best_ref_mv[2]);
  
  #ifdef __cplusplus
  }  // extern "C"