diff options
| author | James Zern <jzern@google.com> | 2016-08-19 01:28:01 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-08-19 01:28:01 -0700 |
| commit | 149d082377569c0330f8ed87327a837d25525f6a (patch) | |
| tree | 832db9f048b7628e23bbc72f0051423ef0d53b70 | |
| parent | 8b4c31584eb22e944975207e37a7f0d5f1eaecb4 (diff) | |
| download | libvpx-149d082377569c0330f8ed87327a837d25525f6a.tar libvpx-149d082377569c0330f8ed87327a837d25525f6a.tar.gz libvpx-149d082377569c0330f8ed87327a837d25525f6a.tar.bz2 libvpx-149d082377569c0330f8ed87327a837d25525f6a.zip | |
vp9_pickmode: quiet float conversion warnings
Change-Id: I591e4f958955b3f2edb2f95a83c54cd83c8ef075
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index ef41c6bf7..22dc3ce20 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1608,7 +1608,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data, if (frame_mv[NEWMV][ref_frame].as_int != INVALID_MV) { const int pre_stride = xd->plane[0].pre[0].stride; int base_mv_sad = INT_MAX; - const float base_mv_bias = sf->base_mv_aggressive ? 1.5 : 1.0; + const float base_mv_bias = sf->base_mv_aggressive ? 1.5f : 1.0f; const uint8_t *const pre_buf = xd->plane[0].pre[0].buf + (frame_mv[NEWMV][ref_frame].as_mv.row >> 3) * pre_stride + @@ -1616,7 +1616,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data, base_mv_sad = cpi->fn_ptr[bsize].sdf( x->plane[0].src.buf, x->plane[0].src.stride, pre_buf, pre_stride); - if (base_mv_sad < base_mv_bias * x->pred_mv_sad[ref_frame]) { + if (base_mv_sad < (int)(base_mv_bias * x->pred_mv_sad[ref_frame])) { // Base layer mv is good. if (!combined_motion_search(cpi, x, bsize, mi_row, mi_col, &frame_mv[NEWMV][ref_frame], &rate_mv, |