diff options
| author | Yaowu Xu <yaowu@google.com> | 2016-06-22 00:12:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-22 00:12:58 +0000 |
| commit | b3933e2d3ccf0de83441eac9d22a145c20ac6803 (patch) | |
| tree | 80b2d751fae62214f6da721845ee562a9e6bd84c /vp9/encoder/vp9_rdopt.c | |
| parent | b8ec5dcdf8f5bc40a137b988437ef5ff3931b03a (diff) | |
| parent | 87bf1a149c2e6f89ed0a6fd804a1f4dc54e346be (diff) | |
| download | libvpx-b3933e2d3ccf0de83441eac9d22a145c20ac6803.tar libvpx-b3933e2d3ccf0de83441eac9d22a145c20ac6803.tar.gz libvpx-b3933e2d3ccf0de83441eac9d22a145c20ac6803.tar.bz2 libvpx-b3933e2d3ccf0de83441eac9d22a145c20ac6803.zip | |
Merge "Fix ubsan warnings: vp9/encoder/vp9_mcomp.c"
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 f15fc31fd..0ed085055 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1715,8 +1715,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, @@ -1916,7 +1916,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, @@ -2346,7 +2346,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, |