summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Converse <aconverse@google.com>2016-05-03 19:11:17 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-05-03 19:11:17 +0000
commita309742a5fe53c4f090ad6aec1536c9bb70ef4de (patch)
tree41c1718992bfb89c4b003ff4f7b52fd281e207d7
parente755a283ddfab1bb7577ba13e75aab415a2cc9aa (diff)
parentf76158131d6480ef179f280d5bd9f3726e403af8 (diff)
downloadlibvpx-a309742a5fe53c4f090ad6aec1536c9bb70ef4de.tar
libvpx-a309742a5fe53c4f090ad6aec1536c9bb70ef4de.tar.gz
libvpx-a309742a5fe53c4f090ad6aec1536c9bb70ef4de.tar.bz2
libvpx-a309742a5fe53c4f090ad6aec1536c9bb70ef4de.zip
Merge "Fix unsigned overflows in temporal filter."
-rw-r--r--vp9/encoder/vp9_temporal_filter.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_temporal_filter.c b/vp9/encoder/vp9_temporal_filter.c
index ebe28b8bf..2ba2750e4 100644
--- a/vp9/encoder/vp9_temporal_filter.c
+++ b/vp9/encoder/vp9_temporal_filter.c
@@ -143,8 +143,8 @@ void vp9_temporal_filter_apply_c(uint8_t *frame1,
for (idy = -1; idy <= 1; ++idy) {
for (idx = -1; idx <= 1; ++idx) {
- int row = i + idy;
- int col = j + idx;
+ int row = (int)i + idy;
+ int col = (int)j + idx;
if (row >= 0 && row < (int)block_height &&
col >= 0 && col < (int)block_width) {
@@ -211,8 +211,8 @@ void vp9_highbd_temporal_filter_apply_c(uint8_t *frame1_8,
for (idy = -1; idy <= 1; ++idy) {
for (idx = -1; idx <= 1; ++idx) {
- int row = i + idy;
- int col = j + idx;
+ int row = (int)i + idy;
+ int col = (int)j + idx;
if (row >= 0 && row < (int)block_height &&
col >= 0 && col < (int)block_width) {