1 files changed, 14 insertions, 13 deletions

diff --git a/vp8/encoder/mcomp.h b/vp8/encoder/mcomp.h
index d655b837e..85c7513ec 100644
--- a/vp8/encoder/mcomp.h
+++ b/vp8/encoder/mcomp.h
@@ -26,7 +26,7 @@ extern void accum_mv_refs(MB_PREDICTION_MODE, const int near_mv_ref_cts[4]);
 #define MAX_FIRST_STEP (1 << (MAX_MVSEARCH_STEPS-1))            // Maximum size of the first step in full pel units
 
 extern void print_mode_context(void);
-extern int vp8_mv_bit_cost(MV *mv, MV *ref, int *mvcost[2], int Weight);
+extern int vp8_mv_bit_cost(int_mv *mv, int_mv *ref, int *mvcost[2], int Weight);
 extern void vp8_init_dsmotion_compensation(MACROBLOCK *x, int stride);
 extern void vp8_init3smotion_compensation(MACROBLOCK *x,  int stride);
 
@@ -36,20 +36,21 @@ extern int vp8_hex_search
     MACROBLOCK *x,
     BLOCK *b,
     BLOCKD *d,
-    MV *ref_mv,
-    MV *best_mv,
+    int_mv *ref_mv,
+    int_mv *best_mv,
     int search_param,
     int error_per_bit,
     int *num00,
     const vp8_variance_fn_ptr_t *vf,
     int *mvsadcost[2],
     int *mvcost[2],
-    MV *center_mv
+    int_mv *center_mv
 );
 
 typedef int (fractional_mv_step_fp)
-    (MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *bestmv, MV *ref_mv,
-     int error_per_bit, const vp8_variance_fn_ptr_t *vfp, int *mvcost[2], int *distortion, unsigned int *sse);
+    (MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *bestmv, int_mv *ref_mv,
+     int error_per_bit, const vp8_variance_fn_ptr_t *vfp, int *mvcost[2],
+     int *distortion, unsigned int *sse);
 extern fractional_mv_step_fp vp8_find_best_sub_pixel_step_iteratively;
 extern fractional_mv_step_fp vp8_find_best_sub_pixel_step;
 extern fractional_mv_step_fp vp8_find_best_half_pixel_step;
@@ -61,12 +62,12 @@ extern fractional_mv_step_fp vp8_skip_fractional_mv_step;
      MACROBLOCK *x, \
      BLOCK *b, \
      BLOCKD *d, \
-     MV *ref_mv, \
+     int_mv *ref_mv, \
      int error_per_bit, \
      int distance, \
      vp8_variance_fn_ptr_t *fn_ptr, \
      int *mvcost[2], \
-     MV *center_mv \
+     int_mv *center_mv \
     )
 
 #define prototype_refining_search_sad(sym)\
@@ -75,12 +76,12 @@ extern fractional_mv_step_fp vp8_skip_fractional_mv_step;
      MACROBLOCK *x, \
      BLOCK *b, \
      BLOCKD *d, \
-     MV *ref_mv, \
+     int_mv *ref_mv, \
      int error_per_bit, \
      int distance, \
      vp8_variance_fn_ptr_t *fn_ptr, \
      int *mvcost[2], \
-     MV *center_mv \
+     int_mv *center_mv \
     )
 
 #define prototype_diamond_search_sad(sym)\
@@ -89,14 +90,14 @@ extern fractional_mv_step_fp vp8_skip_fractional_mv_step;
      MACROBLOCK *x, \
      BLOCK *b, \
      BLOCKD *d, \
-     MV *ref_mv, \
-     MV *best_mv, \
+     int_mv *ref_mv, \
+     int_mv *best_mv, \
      int search_param, \
      int error_per_bit, \
      int *num00, \
      vp8_variance_fn_ptr_t *fn_ptr, \
      int *mvcost[2], \
-     MV *center_mv \
+     int_mv *center_mv \
     )
 
 #if ARCH_X86 || ARCH_X86_64