summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHien Ho <hienho@google.com>2019-10-04 15:53:02 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-10-04 15:53:02 +0000
commit08da66d5df27c5eabcc84f420ae6fb3969bf1f73 (patch)
tree7dcdf954736c522bcc3e73a0f1752b4f6a236bca
parent891c4b3ce61e76a5fea48b37cc7a5ac91e02d68a (diff)
parente14acc942b33d525b135108d197d4bb4809cb973 (diff)
downloadlibvpx-08da66d5df27c5eabcc84f420ae6fb3969bf1f73.tar
libvpx-08da66d5df27c5eabcc84f420ae6fb3969bf1f73.tar.gz
libvpx-08da66d5df27c5eabcc84f420ae6fb3969bf1f73.tar.bz2
libvpx-08da66d5df27c5eabcc84f420ae6fb3969bf1f73.zip
Merge "vp9/common/vp9_reconinter: fix int sanitizer warnings"
-rw-r--r--vp9/common/vp9_reconinter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c
index 04f41e6a3..ff59ff504 100644
--- a/vp9/common/vp9_reconinter.c
+++ b/vp9/common/vp9_reconinter.c
@@ -96,8 +96,8 @@ MV clamp_mv_to_umv_border_sb(const MACROBLOCKD *xd, const MV *src_mv, int bw,
const int spel_right = spel_left - SUBPEL_SHIFTS;
const int spel_top = (VP9_INTERP_EXTEND + bh) << SUBPEL_BITS;
const int spel_bottom = spel_top - SUBPEL_SHIFTS;
- MV clamped_mv = { src_mv->row * (1 << (1 - ss_y)),
- src_mv->col * (1 << (1 - ss_x)) };
+ MV clamped_mv = { (short)(src_mv->row * (1 << (1 - ss_y))),
+ (short)(src_mv->col * (1 << (1 - ss_x))) };
assert(ss_x <= 1);
assert(ss_y <= 1);