diff options
| author | Frank Galligan <fgalligan@google.com> | 2014-05-08 08:49:12 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-08 08:49:12 -0700 |
| commit | 07f9fa4336f680bb16a47451a2b5a7c8f1288bf2 (patch) | |
| tree | 1f1cd83d8d2a040b58acad4c7bce46f427a695a4 | |
| parent | aa3d59fcf9867b00ae7f93219aebd29c9631ce8c (diff) | |
| parent | 0fc027ad33300516c0f75b260dfbf45f5605c580 (diff) | |
| download | libvpx-07f9fa4336f680bb16a47451a2b5a7c8f1288bf2.tar libvpx-07f9fa4336f680bb16a47451a2b5a7c8f1288bf2.tar.gz libvpx-07f9fa4336f680bb16a47451a2b5a7c8f1288bf2.tar.bz2 libvpx-07f9fa4336f680bb16a47451a2b5a7c8f1288bf2.zip | |
Merge "vp9_pickmode: Fix signed/unsigned mismatch."
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |