From: Tom Finegan <tomfinegan@google.com>
Date: Thu, 20 Feb 2014 19:57:36 +0000 (-0800)
Subject: Merge "vp9_vaq.c: Cast result of round() to int to silence warning caused by clamp... 
X-Git-Tag: v1.4.0~2315
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=622451623590b8470a8c6fbaae6f0955e0e48451;p=libvpx

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

622451623590b8470a8c6fbaae6f0955e0e48451
diff --cc vp9/encoder/vp9_vaq.c
index 89570a648,2bb4c332d..600029b19
--- a/vp9/encoder/vp9_vaq.c
+++ b/vp9/encoder/vp9_vaq.c
@@@ -141,8 -141,8 +141,8 @@@ int vp9_block_energy(VP9_COMP *cpi, MAC
    double energy;
    unsigned int var = block_variance(cpi, x, bs);
  
 -  vp9_clear_system_state();  // __asm emms;
 +  vp9_clear_system_state();
  
    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);
  }