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

diff --cc vp9/encoder/vp9_vaq.c
index 89570a6,2bb4c33..600029b
--- 1/vp9/encoder/vp9_vaq.c
--- 2/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);
  }