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

62245162 · Tom Finegan · Gerrit Code Review · 15e95086 · 76c1896f · 62245162
Commit 62245162 authored Feb 20, 2014 by Tom Finegan Committed by Gerrit Code Review Feb 20, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

vp9/encoder/vp9_vaq.c vp9/encoder/vp9_vaq.c +1 -1

No files found.
--- 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();

  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);
 }