From d82d11397f613f8881328585b7442f29aec462c1 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 20 Jul 2015 17:16:20 +0200 Subject: [PATCH] avutil/arm/intmath: return int for uint8 / uint16 clip The C functions return uint8/16_t but that is effectively int not unsigned int Fixes fate-filter-tblend We do not return uint8/16_t as that would require the compiler to truncate the values, slowing it down. Signed-off-by: Michael Niedermayer --- libavutil/arm/intmath.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h index 3216af003a..65e42c5733 100644 --- a/libavutil/arm/intmath.h +++ b/libavutil/arm/intmath.h @@ -31,9 +31,9 @@ #if HAVE_ARMV6_INLINE #define av_clip_uint8 av_clip_uint8_arm -static av_always_inline av_const unsigned av_clip_uint8_arm(int a) +static av_always_inline av_const int av_clip_uint8_arm(int a) { - unsigned x; + int x; __asm__ ("usat %0, #8, %1" : "=r"(x) : "r"(a)); return x; } @@ -47,9 +47,9 @@ static av_always_inline av_const int av_clip_int8_arm(int a) } #define av_clip_uint16 av_clip_uint16_arm -static av_always_inline av_const unsigned av_clip_uint16_arm(int a) +static av_always_inline av_const int av_clip_uint16_arm(int a) { - unsigned x; + int x; __asm__ ("usat %0, #16, %1" : "=r"(x) : "r"(a)); return x; }