diff options
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_quantize.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 130fc2b03..f027f9f31 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1037,7 +1037,7 @@ void vp9_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x, RD_COST *rd_cost, // Change the limit of this loop to add other intra prediction // mode tests. for (this_mode = DC_PRED; this_mode <= H_PRED; ++this_mode) { - this_rdc.rate = this_rdc.dist = 0; + this_rdc.dist = this_rdc.rate = 0; args.mode = this_mode; args.skippable = 1; args.rdc = &this_rdc; @@ -1921,7 +1921,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, mi->mode = this_mode; mi->ref_frame[0] = INTRA_FRAME; - this_rdc.rate = this_rdc.dist = 0; + this_rdc.dist = this_rdc.rate = 0; args.mode = this_mode; args.skippable = 1; args.rdc = &this_rdc; 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) |