shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix an overflow warning in optimize_b()"

--- a/vp9/encoder/vp9_encodemb.c

+++ b/vp9/encoder/vp9_encodemb.c

@@ -102,7 +102,7 @@

   const int16_t *const nb = so->neighbors;

   const int dq_step[2] = { dequant_ptr[0] >> shift, dequant_ptr[1] >> shift };

   int next = eob, sz = 0;

-  const int64_t rdmult = (mb->rdmult * plane_rd_mult[ref][type]) >> 1;

+  const int64_t rdmult = ((int64_t)mb->rdmult * plane_rd_mult[ref][type]) >> 1;

   const int64_t rddiv = mb->rddiv;

   int64_t rd_cost0, rd_cost1;

   int rate0, rate1;