Commit 62245162 authored by Tom Finegan's avatar Tom Finegan Committed by Gerrit Code Review
Browse files

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

parents 15e95086 76c1896f
......@@ -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);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment