diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-05-26 11:45:14 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-05-26 11:45:14 -0400 |
| commit | d1910cc4843ad4cc81964de3779222087c50c220 (patch) | |
| tree | aadf5b90cb5013be4c068d2fffd49b4be278d120 /vp8/common | |
| parent | 9b2565cd848efc7d0976376407dfe0b2e380572e (diff) | |
| parent | 40b850b4586189ab075f3123ec4f8f303667634f (diff) | |
| download | libvpx-d1910cc4843ad4cc81964de3779222087c50c220.tar libvpx-d1910cc4843ad4cc81964de3779222087c50c220.tar.gz libvpx-d1910cc4843ad4cc81964de3779222087c50c220.tar.bz2 libvpx-d1910cc4843ad4cc81964de3779222087c50c220.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/entropymode.c | 8 | ||||
| -rw-r--r-- | vp8/common/entropymode.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vp8/common/entropymode.c b/vp8/common/entropymode.c index e9dc668b2..930e896ce 100644 --- a/vp8/common/entropymode.c +++ b/vp8/common/entropymode.c @@ -33,11 +33,11 @@ typedef enum SUBMVREF_LEFT_ABOVE_ZED } sumvfref_t; -int vp8_mv_cont(const MV *l, const MV *a) +int vp8_mv_cont(const int_mv *l, const int_mv *a) { - int lez = (l->row == 0 && l->col == 0); - int aez = (a->row == 0 && a->col == 0); - int lea = (l->row == a->row && l->col == a->col); + int lez = (l->as_int == 0); + int aez = (a->as_int == 0); + int lea = (l->as_int == a->as_int); if (lea && lez) return SUBMVREF_LEFT_ABOVE_ZED; diff --git a/vp8/common/entropymode.h b/vp8/common/entropymode.h index da6ae8ead..fdb170df3 100644 --- a/vp8/common/entropymode.h +++ b/vp8/common/entropymode.h @@ -25,7 +25,7 @@ extern const int vp8_mbsplit_count [VP8_NUMMBSPLITS]; /* # of subsets */ extern const vp8_prob vp8_mbsplit_probs [VP8_NUMMBSPLITS-1]; -extern int vp8_mv_cont(const MV *l, const MV *a); +extern int vp8_mv_cont(const int_mv *l, const int_mv *a); #define SUBMVREF_COUNT 5 extern const vp8_prob vp8_sub_mv_ref_prob2 [SUBMVREF_COUNT][VP8_SUBMVREFS-1]; |