diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-03 00:05:17 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-06-03 00:05:17 -0400 |
| commit | 90e84704ae940d7380bba36310c94a05bc9f4569 (patch) | |
| tree | 97321efb1da37651c76544a1a570e76de1c009f3 /vp8/encoder/mcomp.c | |
| parent | e96c1e8dfbcceae3dcf26c517af32fd9985e41ad (diff) | |
| parent | 4ce6928d5b048ce5f82a97cd3d56267432fdc634 (diff) | |
| download | libvpx-90e84704ae940d7380bba36310c94a05bc9f4569.tar libvpx-90e84704ae940d7380bba36310c94a05bc9f4569.tar.gz libvpx-90e84704ae940d7380bba36310c94a05bc9f4569.tar.bz2 libvpx-90e84704ae940d7380bba36310c94a05bc9f4569.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/mcomp.c')
| -rw-r--r-- | vp8/encoder/mcomp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c index aac39d582..50c4745b1 100644 --- a/vp8/encoder/mcomp.c +++ b/vp8/encoder/mcomp.c @@ -1000,7 +1000,8 @@ cal_neighbors: this_mv.as_mv.col = bc<<3; this_offset = (unsigned char *)(*(d->base_pre) + d->pre + (br * (in_what_stride)) + bc); - return vfp->vf(what, what_stride, this_offset, in_what_stride, &bestsad) + mv_err_cost(&this_mv, center_mv, mvcost, x->errorperbit) ; + return vfp->vf(what, what_stride, this_offset, in_what_stride, &bestsad) + + mv_err_cost(&this_mv, center_mv, mvcost, x->errorperbit) ; } #undef CHECK_BOUNDS #undef CHECK_POINT |