ref: a724477d6926c7fe0f20809cf26563c4047372b3
parent: e9b61724768af109d221bd4564af6a7e6324f26d
parent: bd0c981744307a0e7e934c04d08288b310419cb4
author: Johann Koenig <johannkoenig@google.com>
date: Fri Jun 17 00:19:37 EDT 2016
Merge "vp8: correct function return types"
--- a/vp8/common/findnearmv.h
+++ b/vp8/common/findnearmv.h
@@ -104,7 +104,7 @@
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 @@
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))
{