From: Debargha Mukherjee Date: Wed, 24 Feb 2016 18:27:56 +0000 (-0800) Subject: Some fixes in reconintra X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ef0db078e65da2d8d817850b4087b0c41cb6758;p=libvpx Some fixes in reconintra Change-Id: I0b0fa7c9853ce12d39ee21829686b308154b2c61 --- diff --git a/vp10/common/reconintra.c b/vp10/common/reconintra.c index 99c33403a..d98e2b9bf 100644 --- a/vp10/common/reconintra.c +++ b/vp10/common/reconintra.c @@ -372,14 +372,13 @@ static void dr_prediction_z1(uint8_t *dst, ptrdiff_t stride, int bs, static void dr_prediction_z2(uint8_t *dst, ptrdiff_t stride, int bs, const uint8_t *above, const uint8_t *left, int dx, int dy, INTRA_FILTER filter_type) { - int r, c, x, y, shift1, shift2, val, base1, base2, use_above; + int r, c, x, y, shift1, shift2, val, base1, base2; assert(dx > 0); assert(dy > 0); x = -dx; for (r = 0; r < bs; ++r, x -= dx, dst += stride) { - use_above = 0; base1 = x >> 8; y = (r << 8) - dy; for (c = 0; c < bs; ++c, ++base1, y -= dy) { @@ -441,8 +440,8 @@ static void dr_prediction_z3(uint8_t *dst, ptrdiff_t stride, int bs, len = VPXMIN(bs, 2 * bs - 1 - base); if (len <= 0) { - for (i = r; r < bs; ++r) { - dst[i * stride + c] = left[ 2 * bs - 1]; + for (r = 0; r < bs; ++r) { + dst[r * stride + c] = left[ 2 * bs - 1]; } continue; }