diff options
Diffstat (limited to 'vp8/encoder/encodemv.h')
| -rw-r--r-- | vp8/encoder/encodemv.h | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/vp8/encoder/encodemv.h b/vp8/encoder/encodemv.h index e675fe058..254536580 100644 --- a/vp8/encoder/encodemv.h +++ b/vp8/encoder/encodemv.h @@ -14,31 +14,17 @@ #include "onyx_int.h" -#if CONFIG_NEWMVENTROPY -void vp8_write_nmvprobs(VP8_COMP *, int usehp); -void vp8_encode_nmv(vp8_writer *w, const MV *mv, const MV *ref, - const nmv_context *mvctx); -void vp8_encode_nmv_fp(vp8_writer *w, const MV *mv, const MV *ref, - const nmv_context *mvctx, int usehp); +void vp8_write_nmvprobs(VP8_COMP* const, int usehp, vp8_writer* const); +void vp8_encode_nmv(vp8_writer* const w, const MV* const mv, + const MV* const ref, const nmv_context* const mvctx); +void vp8_encode_nmv_fp(vp8_writer* const w, const MV* const mv, + const MV* const ref, const nmv_context *mvctx, + int usehp); void vp8_build_nmv_cost_table(int *mvjoint, int *mvcost[2], const nmv_context *mvctx, int usehp, int mvc_flag_v, int mvc_flag_h); -#else /* CONFIG_NEWMVENTROPY */ -void vp8_write_mvprobs(VP8_COMP *); -void vp8_encode_motion_vector(vp8_writer *, const MV *, - const MV_CONTEXT *); -void vp8_build_component_cost_table(int *mvcost[2], - const MV_CONTEXT *mvc, - int mvc_flag[2]); -void vp8_write_mvprobs_hp(VP8_COMP *); -void vp8_encode_motion_vector_hp(vp8_writer *, const MV *, - const MV_CONTEXT_HP *); -void vp8_build_component_cost_table_hp(int *mvcost[2], - const MV_CONTEXT_HP *mvc, - int mvc_flag[2]); -#endif /* CONFIG_NEWMVENTROPY */ #endif |