From: Tom Finegan Date: Thu, 8 May 2014 01:20:29 +0000 (-0700) Subject: vp9_pickmode: Fix signed/unsigned mismatch. X-Git-Tag: v1.4.0~1635^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fc027ad33300516c0f75b260dfbf45f5605c580;p=libvpx vp9_pickmode: Fix signed/unsigned mismatch. Avoids getting reverted on the next libvpx chrome roll attempt. Change-Id: I2431bd601111a78320af5f211f6413009674f1c8 --- diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index ad77cd0fe..adaa04447 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -161,8 +161,8 @@ static void model_rd_for_sb_y(VP9_COMP *cpi, BLOCK_SIZE bsize, struct macroblock_plane *const p = &x->plane[0]; struct macroblockd_plane *const pd = &xd->plane[0]; - int var = cpi->fn_ptr[bsize].vf(p->src.buf, p->src.stride, - pd->dst.buf, pd->dst.stride, &sse); + unsigned int var = cpi->fn_ptr[bsize].vf(p->src.buf, p->src.stride, + pd->dst.buf, pd->dst.stride, &sse); // TODO(jingning) This is a temporary solution to account for frames with // light changes. Need to customize the rate-distortion modeling for non-RD