From: Tom Finegan <tomfinegan@google.com>
Date: Wed, 19 Feb 2014 02:26:42 +0000 (-0800)
Subject: vp9_vaq.c: Cast result of round() to int to silence warning caused by clamp() call.
X-Git-Tag: v1.4.0~2315^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76c1896fda3ef3e0847b39882bf6143af245df06;p=libvpx

vp9_vaq.c: Cast result of round() to int to silence warning caused by clamp() call.

clamp() wants an int, round returns a double, warning! Too bad we can't just use lrint.

Change-Id: I9c08289dde742fac0d673df8559a1892edcd1bc7
---

diff --git a/vp9/encoder/vp9_vaq.c b/vp9/encoder/vp9_vaq.c
index 896cd2ca2..2bb4c332d 100644
--- a/vp9/encoder/vp9_vaq.c
+++ b/vp9/encoder/vp9_vaq.c
@@ -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);
 }