]> granicus.if.org Git - libvpx/commitdiff
vp9_encodeframe: resolve -Wshorten-64-to-32 in hbd
authorJames Zern <jzern@google.com>
Wed, 5 Apr 2017 04:04:18 +0000 (21:04 -0700)
committerJames Zern <jzern@google.com>
Thu, 6 Apr 2017 00:34:06 +0000 (17:34 -0700)
vp9_high_get_sby_perpixel_variance the variance operated on in is
already in 32-bits

Change-Id: I97006eb9c08dbd0f88ee35e1a1ca205737508296

vp9/encoder/vp9_encodeframe.c

index 1a4512f9dde929c554308f93a98d97e0130041ce..c56f0b047e6c8e444463fac7d229144e2c2ce8db 100644 (file)
@@ -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