diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-05-13 10:16:37 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-05-13 10:16:37 -0400 |
| commit | 72913435cb853def83bbbeec7cb69912d75ee368 (patch) | |
| tree | 77b53535700782209dd937341886d4071e0afe2d /vp8/encoder/encodeframe.c | |
| parent | 25f10257f294263848080afcd1c53768fdb1072d (diff) | |
| parent | 71a7501bcf6ada5068d102c03ae597023e986538 (diff) | |
| download | libvpx-72913435cb853def83bbbeec7cb69912d75ee368.tar libvpx-72913435cb853def83bbbeec7cb69912d75ee368.tar.gz libvpx-72913435cb853def83bbbeec7cb69912d75ee368.tar.bz2 libvpx-72913435cb853def83bbbeec7cb69912d75ee368.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/common/blockd.h
vp8/decoder/decodemv.c
Change-Id: Ib97c226d5b33b1ac1675d9c96eac1986af4dd579
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index f21ecbd98..988973711 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1480,8 +1480,8 @@ int vp8cx_encode_inter_macroblock } else { - MV best_ref_mv; - MV nearest, nearby; + int_mv best_ref_mv; + int_mv nearest, nearby; int mdcounts[4]; int ref_fb_idx; @@ -1509,15 +1509,15 @@ int vp8cx_encode_inter_macroblock { if (xd->block[i].bmi.mode == NEW4X4) { - cpi->MVcount[0][mv_max+((xd->block[i].bmi.mv.as_mv.row - best_ref_mv.row) >> 1)]++; - cpi->MVcount[1][mv_max+((xd->block[i].bmi.mv.as_mv.col - best_ref_mv.col) >> 1)]++; + cpi->MVcount[0][mv_max+((xd->block[i].bmi.mv.as_mv.row - best_ref_mv.as_mv.row) >> 1)]++; + cpi->MVcount[1][mv_max+((xd->block[i].bmi.mv.as_mv.col - best_ref_mv.as_mv.col) >> 1)]++; } } } else if (xd->mode_info_context->mbmi.mode == NEWMV) { - cpi->MVcount[0][mv_max+((xd->block[0].bmi.mv.as_mv.row - best_ref_mv.row) >> 1)]++; - cpi->MVcount[1][mv_max+((xd->block[0].bmi.mv.as_mv.col - best_ref_mv.col) >> 1)]++; + cpi->MVcount[0][mv_max+((xd->block[0].bmi.mv.as_mv.row - best_ref_mv.as_mv.row) >> 1)]++; + cpi->MVcount[1][mv_max+((xd->block[0].bmi.mv.as_mv.col - best_ref_mv.as_mv.col) >> 1)]++; } if (!x->skip) |