]> granicus.if.org Git - libvpx/commitdiff
vp9_vaq.c: Cast result of round() to int to silence warning caused by clamp() call.
authorTom Finegan <tomfinegan@google.com>
Wed, 19 Feb 2014 02:26:42 +0000 (18:26 -0800)
committerTom Finegan <tomfinegan@google.com>
Wed, 19 Feb 2014 02:26:42 +0000 (18:26 -0800)
clamp() wants an int, round returns a double, warning! Too bad we can't just use lrint.

Change-Id: I9c08289dde742fac0d673df8559a1892edcd1bc7

vp9/encoder/vp9_vaq.c

index 896cd2ca27714b4ecce28f8d66d0be80c69caed3..2bb4c332ddf908a609419b34a7bed050529dc650 100644 (file)
@@ -144,5 +144,5 @@ int vp9_block_energy(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs) {
   vp9_clear_system_state();  // __asm emms;
 
   energy = 0.9 * (log(var + 1.0) - 10.0);
-  return clamp(round(energy), ENERGY_MIN, ENERGY_MAX);
+  return clamp((int)round(energy), ENERGY_MIN, ENERGY_MAX);
 }