diff options
| author | Yaowu Xu <yaowu@google.com> | 2016-06-16 21:42:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-16 21:42:41 +0000 |
| commit | 0c1da40ea86b08a702782bec667f8b358fc7100f (patch) | |
| tree | 1d50adbb81582b32dafb2de0c40f7d305b234947 /vp9 | |
| parent | 799ab7c064ec4fec8f0ea1a480f814fc4d4e97bf (diff) | |
| parent | 25110f2837e0ce58cacf74080d87654c6a046a12 (diff) | |
| download | libvpx-0c1da40ea86b08a702782bec667f8b358fc7100f.tar libvpx-0c1da40ea86b08a702782bec667f8b358fc7100f.tar.gz libvpx-0c1da40ea86b08a702782bec667f8b358fc7100f.tar.bz2 libvpx-0c1da40ea86b08a702782bec667f8b358fc7100f.zip | |
Merge "Fix an ubsan warning: vp9_quantizer.c"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_quantize.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_quantize.c b/vp9/encoder/vp9_quantize.c index 9766c059c..d68b6845c 100644 --- a/vp9/encoder/vp9_quantize.c +++ b/vp9/encoder/vp9_quantize.c @@ -94,7 +94,7 @@ void vp9_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, 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) |