diff options
| author | Johann <johannkoenig@google.com> | 2016-06-16 14:17:28 -0700 |
|---|---|---|
| committer | Johann Koenig <johannkoenig@google.com> | 2016-06-16 21:57:46 +0000 |
| commit | bd0c981744307a0e7e934c04d08288b310419cb4 (patch) | |
| tree | eafa4912110a1077061429852d05d21825b09e5e /vp8/common | |
| parent | 799ab7c064ec4fec8f0ea1a480f814fc4d4e97bf (diff) | |
| download | libvpx-bd0c981744307a0e7e934c04d08288b310419cb4.tar libvpx-bd0c981744307a0e7e934c04d08288b310419cb4.tar.gz libvpx-bd0c981744307a0e7e934c04d08288b310419cb4.tar.bz2 libvpx-bd0c981744307a0e7e934c04d08288b310419cb4.zip | |
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
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/findnearmv.h | 5 |
1 files 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)) { |