diff options
| author | Hui Su <huisu@google.com> | 2017-01-25 22:49:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-25 22:49:30 +0000 |
| commit | 37cd112b0f1150679b0966bee13ec9ff8e09a642 (patch) | |
| tree | 2d784bf3d245e5600f98417179b2f2c14c1b1bb4 /vp9/encoder/vp9_encodemb.c | |
| parent | 3b2d08a93b218c110100d9ac2b7e939f3a7c4ed4 (diff) | |
| parent | 519b2e48a814e13a24177b1afd264edba7a86ef5 (diff) | |
| download | libvpx-37cd112b0f1150679b0966bee13ec9ff8e09a642.tar.gz | |
Merge "Fix an overflow warning in optimize_b()"
Diffstat (limited to 'vp9/encoder/vp9_encodemb.c')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 1dc8d34d5..0c025ad43 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -102,7 +102,7 @@ int vp9_optimize_b(MACROBLOCK *mb, int plane, int block, TX_SIZE tx_size, 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; |