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

This commit is contained in:
Tom Finegan 2014-02-20 11:57:36 -08:00 committed by Gerrit Code Review
commit 6224516235

View File

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