diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-09-26 21:01:20 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-09-26 21:01:20 +0000 |
| commit | 3288177150eae9a9f11b6a5e4574f0ccd5fe9f57 (patch) | |
| tree | a343b060c142a9404eed6daf289ec5779428a45d | |
| parent | 33ce384688ffbd5d782368f6b5998d770ddd6e17 (diff) | |
| download | ffmpeg-3288177150eae9a9f11b6a5e4574f0ccd5fe9f57.tar.gz | |
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
| -rw-r--r-- | libavutil/arm/intreadwrite.h | 4 |
1 files 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; } |