]> granicus.if.org Git - libvpx/commitdiff
vp9_pickmode: Fix signed/unsigned mismatch.
authorTom Finegan <tomfinegan@google.com>
Thu, 8 May 2014 01:20:29 +0000 (18:20 -0700)
committerTom Finegan <tomfinegan@google.com>
Thu, 8 May 2014 01:20:29 +0000 (18:20 -0700)
Avoids getting reverted on the next libvpx chrome roll attempt.

Change-Id: I2431bd601111a78320af5f211f6413009674f1c8

vp9/encoder/vp9_pickmode.c

index ad77cd0fe204765a1403f500d4d141922f9eeda1..adaa04447a42aa8c6251c1fa741b94b1bc125c37 100644 (file)
@@ -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