diff options
| author | Yaowu Xu <yaowu@google.com> | 2016-06-20 10:13:30 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2016-06-21 15:37:59 -0700 |
| commit | 87bf1a149c2e6f89ed0a6fd804a1f4dc54e346be (patch) | |
| tree | 05b200c035fb287b37f615d8505eee1bcd731ca8 /vp9/encoder/vp9_rdopt.c | |
| parent | 40477f1f70556cbd17c7296a332e8014129baa21 (diff) | |
| download | libvpx-87bf1a149c2e6f89ed0a6fd804a1f4dc54e346be.tar libvpx-87bf1a149c2e6f89ed0a6fd804a1f4dc54e346be.tar.gz libvpx-87bf1a149c2e6f89ed0a6fd804a1f4dc54e346be.tar.bz2 libvpx-87bf1a149c2e6f89ed0a6fd804a1f4dc54e346be.zip | |
Fix ubsan warnings: vp9/encoder/vp9_mcomp.c
This commit fixes a number of ubsan warnings in HBD build.
BUG=webm:1219
Change-Id: I05f0fd0ef50e93db4ba34205005c54af1ed32acc
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index a30418286..2e46aa4cd 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1710,8 +1710,8 @@ static void joint_motion_search(VP9_COMP *cpi, MACROBLOCK *x, x->mv_row_max = tmp_row_max; if (bestsme < INT_MAX) { - int dis; /* TODO: use dis in distortion calculation later. */ - unsigned int sse; + uint32_t dis; /* TODO: use dis in distortion calculation later. */ + uint32_t sse; bestsme = cpi->find_fractional_mv_step( x, &tmp_mv, &ref_mv[id].as_mv, @@ -1911,7 +1911,7 @@ static int64_t rd_pick_best_sub8x8_mode(VP9_COMP *cpi, MACROBLOCK *x, INT_MAX, 1); if (bestsme < INT_MAX) { - int distortion; + uint32_t distortion; cpi->find_fractional_mv_step( x, new_mv, @@ -2341,7 +2341,7 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x, x->mv_row_max = tmp_row_max; if (bestsme < INT_MAX) { - int dis; /* TODO: use dis in distortion calculation later. */ + uint32_t dis; /* TODO: use dis in distortion calculation later. */ cpi->find_fractional_mv_step(x, &tmp_mv->as_mv, &ref_mv, cm->allow_high_precision_mv, x->errorperbit, |