From 3288177150eae9a9f11b6a5e4574f0ccd5fe9f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Sun, 26 Sep 2010 21:01:20 +0000 Subject: [PATCH] ARM: change return type of AV_RN16() to unsigned This prevents gcc inserting useless UXTH instructions, at least in some cases. Originally committed as revision 25212 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/arm/intreadwrite.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/arm/intreadwrite.h b/libavutil/arm/intreadwrite.h index 011694d711..339f8856fa 100644 --- a/libavutil/arm/intreadwrite.h +++ b/libavutil/arm/intreadwrite.h @@ -25,9 +25,9 @@ #if HAVE_FAST_UNALIGNED && HAVE_INLINE_ASM #define AV_RN16 AV_RN16 -static av_always_inline uint16_t AV_RN16(const void *p) +static av_always_inline unsigned AV_RN16(const void *p) { - uint16_t v; + unsigned v; __asm__ ("ldrh %0, %1" : "=r"(v) : "m"(*(const uint16_t *)p)); return v; }