From bd0c981744307a0e7e934c04d08288b310419cb4 Mon Sep 17 00:00:00 2001 From: Johann Date: Thu, 16 Jun 2016 14:17:28 -0700 Subject: [PATCH] vp8: correct function return types left_above_mv and above_block_mv return as_int as_int is defined as uint32_t in vp8/common/mv.h Cleans up -Wextra warnings: signed and unsigned type in conditional expression this_mv->as_int = col ? d[-1].bmi.mv.as_int : left_block_mv(mic, i); ^ this_mv->as_int = row ? d[-4].bmi.mv.as_int : above_block_mv(mic, i, mis); ^ left_mv.as_int = col ? d[-1].bmi.mv.as_int : ^ Change-Id: Ia043764e4ce93d2152d2269b1c7b28b5d5f814cf --- vp8/common/findnearmv.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vp8/common/findnearmv.h b/vp8/common/findnearmv.h index 155847ca2..472a7b5d8 100644 --- a/vp8/common/findnearmv.h +++ b/vp8/common/findnearmv.h @@ -104,7 +104,7 @@ vp8_prob *vp8_mv_ref_probs( extern const unsigned char vp8_mbsplit_offset[4][16]; -static INLINE int left_block_mv(const MODE_INFO *cur_mb, int b) +static INLINE uint32_t left_block_mv(const MODE_INFO *cur_mb, int b) { if (!(b & 3)) { @@ -119,7 +119,8 @@ static INLINE int left_block_mv(const MODE_INFO *cur_mb, int b) return (cur_mb->bmi + b - 1)->mv.as_int; } -static INLINE int above_block_mv(const MODE_INFO *cur_mb, int b, int mi_stride) +static INLINE uint32_t above_block_mv(const MODE_INFO *cur_mb, int b, + int mi_stride) { if (!(b >> 2)) {