diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-05-03 18:03:06 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-03 18:03:06 -0700 |
| commit | 842c573e048476921c8c2ccedf2963afc698aad5 (patch) | |
| tree | bd2e5cc4905a490e30a1ad79a786fd1f020ac359 | |
| parent | 30d7b79572b5615a885e93db157e8eb2062869f0 (diff) | |
| parent | ee808e52bd0e371f0caad5ca7f29fbc4d5bf2aee (diff) | |
| download | libvpx-842c573e048476921c8c2ccedf2963afc698aad5.tar libvpx-842c573e048476921c8c2ccedf2963afc698aad5.tar.gz libvpx-842c573e048476921c8c2ccedf2963afc698aad5.tar.bz2 libvpx-842c573e048476921c8c2ccedf2963afc698aad5.zip | |
Merge "Fix overflow in RD error calculation code." into experimental
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index e0e0c2afc..0600de2e4 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -602,7 +602,7 @@ static int block_error(int16_t *coeff, int16_t *dqcoeff, for (i = 0; i < block_size; i++) { int this_diff = coeff[i] - dqcoeff[i]; - error += this_diff * this_diff; + error += (unsigned)this_diff * this_diff; } error >>= shift; |