From: James Zern Date: Wed, 5 Apr 2017 04:04:18 +0000 (-0700) Subject: vp9_encodeframe: resolve -Wshorten-64-to-32 in hbd X-Git-Tag: v1.7.0~573^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3e2eb14c5b5561a8edf7c3f1f682dbe16814d9b;p=libvpx vp9_encodeframe: resolve -Wshorten-64-to-32 in hbd vp9_high_get_sby_perpixel_variance the variance operated on in is already in 32-bits Change-Id: I97006eb9c08dbd0f88ee35e1a1ca205737508296 --- diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 1a4512f9d..c56f0b047 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -157,7 +157,8 @@ unsigned int vp9_high_get_sby_perpixel_variance(VP9_COMP *cpi, CONVERT_TO_BYTEPTR(VP9_HIGH_VAR_OFFS_8), 0, &sse); break; } - return ROUND64_POWER_OF_TWO((int64_t)var, num_pels_log2_lookup[bs]); + return (unsigned int)ROUND64_POWER_OF_TWO((int64_t)var, + num_pels_log2_lookup[bs]); } #endif // CONFIG_VP9_HIGHBITDEPTH