ref: 0c1da40ea86b08a702782bec667f8b358fc7100f
parent: 799ab7c064ec4fec8f0ea1a480f814fc4d4e97bf
parent: 25110f2837e0ce58cacf74080d87654c6a046a12
author: Yaowu Xu <[email protected]>
date: Thu Jun 16 17:42:40 EDT 2016
Merge "Fix an ubsan warning: vp9_quantizer.c"
--- a/vp9/encoder/vp9_quantize.c
+++ b/vp9/encoder/vp9_quantize.c
@@ -94,7 +94,7 @@
const int coeff_sign = (coeff >> 31);
const int abs_coeff = (coeff ^ coeff_sign) - coeff_sign;
const int64_t tmp = abs_coeff + round_ptr[rc != 0];
- const uint32_t abs_qcoeff = (uint32_t)((tmp * quant_ptr[rc != 0]) >> 16);
+ const int abs_qcoeff = (int)((tmp * quant_ptr[rc != 0]) >> 16);
qcoeff_ptr[rc] = (tran_low_t)((abs_qcoeff ^ coeff_sign) - coeff_sign);
dqcoeff_ptr[rc] = qcoeff_ptr[rc] * dequant_ptr[rc != 0];
if (abs_qcoeff)