shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix invalid memory access on 2x downscale."

--- a/vp9/common/vp9_reconinter.c

+++ b/vp9/common/vp9_reconinter.c

@@ -470,13 +470,13 @@

       int y1 = ((y0_16 + (h - 1) * ys) >> SUBPEL_BITS) + 1;

       int x_pad = 0, y_pad = 0;

-      if (subpel_x || (sf->x_step_q4 & SUBPEL_MASK)) {

+      if (subpel_x || (sf->x_step_q4 != 16)) {

         x0 -= VP9_INTERP_EXTEND - 1;

         x1 += VP9_INTERP_EXTEND;

         x_pad = 1;

       }

-      if (subpel_y || (sf->y_step_q4 & SUBPEL_MASK)) {

+      if (subpel_y || (sf->y_step_q4 != 16)) {

         y0 -= VP9_INTERP_EXTEND - 1;

         y1 += VP9_INTERP_EXTEND;

         y_pad = 1;