diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-01-11 00:05:23 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-01-11 00:05:27 -0500 |
| commit | 4a3f592109477df381d1d9307fa4cbe747000b8c (patch) | |
| tree | 32b6c966cb15cce5ee36ab6ba00603babd94f9af /vp8/encoder/mcomp.h | |
| parent | 3cb26b486490b4961fd5c7d897112b12a121a3e7 (diff) | |
| parent | 3675b2291cac15e6bc5a9bde9a0da7e00f919aaa (diff) | |
| download | libvpx-4a3f592109477df381d1d9307fa4cbe747000b8c.tar libvpx-4a3f592109477df381d1d9307fa4cbe747000b8c.tar.gz libvpx-4a3f592109477df381d1d9307fa4cbe747000b8c.tar.bz2 libvpx-4a3f592109477df381d1d9307fa4cbe747000b8c.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I0ecbf2f417540d75435542182a661f5f6bb84ac0
Diffstat (limited to 'vp8/encoder/mcomp.h')
| -rw-r--r-- | vp8/encoder/mcomp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/vp8/encoder/mcomp.h b/vp8/encoder/mcomp.h index 122debcae..7600f87fc 100644 --- a/vp8/encoder/mcomp.h +++ b/vp8/encoder/mcomp.h @@ -24,7 +24,6 @@ extern void accum_mv_refs(MB_PREDICTION_MODE, const int near_mv_ref_cts[4]); #define MAX_MVSEARCH_STEPS 8 // The maximum number of steps in a step search given the largest allowed initial step #define MAX_FULL_PEL_VAL ((1 << (MAX_MVSEARCH_STEPS+3)) - 8) // Max full pel mv specified in 1/8 pel units #define MAX_FIRST_STEP (1 << (MAX_MVSEARCH_STEPS-1)) // Maximum size of the first step in full pel units -#define MAX_POSSIBLE_MV (1 << 11) // Maximum MV in 1/8 pel units extern void print_mode_context(void); extern int vp8_mv_bit_cost(MV *mv, MV *ref, int *mvcost[2], int Weight); |