diff options
| author | James Zern <jzern@google.com> | 2015-07-03 18:44:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-03 18:44:02 +0000 |
| commit | 823a126d4c6e0bf784587fda5039c8e90102ceac (patch) | |
| tree | 46ee236b4d0b8d74ae5d62d8146b16c58c25106b /vp9/decoder | |
| parent | 3d4526322ba2446ea31aa29fe6bd5151cd0b9356 (diff) | |
| parent | 52e358f13edf5e792ba68d4f19e840c52ab554a3 (diff) | |
| download | libvpx-823a126d4c6e0bf784587fda5039c8e90102ceac.tar libvpx-823a126d4c6e0bf784587fda5039c8e90102ceac.tar.gz libvpx-823a126d4c6e0bf784587fda5039c8e90102ceac.tar.bz2 libvpx-823a126d4c6e0bf784587fda5039c8e90102ceac.zip | |
Merge "Revert "Correct the inter prediction coordinate...""
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 51e3e45d3..a7e9fdaa6 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -575,10 +575,10 @@ static void dec_build_inter_predictors(VP9Decoder *const pbi, MACROBLOCKD *xd, // width/height is not a multiple of 8 pixels. if (is_scaled || scaled_mv.col || scaled_mv.row || (frame_width & 0x7) || (frame_height & 0x7)) { - int y1 = (y0_16 + (h - 1) * ys) >> SUBPEL_BITS; + int y1 = ((y0_16 + (h - 1) * ys) >> SUBPEL_BITS) + 1; // Get reference block bottom right horizontal coordinate. - int x1 = (x0_16 + (w - 1) * xs) >> SUBPEL_BITS; + int x1 = ((x0_16 + (w - 1) * xs) >> SUBPEL_BITS) + 1; int x_pad = 0, y_pad = 0; if (subpel_x || (sf->x_step_q4 != SUBPEL_SHIFTS)) { |