diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-02-22 00:34:08 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-02-22 00:34:08 +0000 |
| commit | ac73f1a8169c95a9cd3c42d43849432d63bc5bdd (patch) | |
| tree | 71139267f8a984ba3c0b1b200f62ab29991959e4 /libavutil/arm/bswap.h | |
| parent | a87b2f6df4607cbedaf69c2a3242d98220ed35d8 (diff) | |
ARM: change argument/return type of bswap_16() to unsigned 32-bit
This avoids unnecessary masking otherwise added by the compilers.
Originally committed as revision 21953 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/arm/bswap.h')
| -rw-r--r-- | libavutil/arm/bswap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/arm/bswap.h b/libavutil/arm/bswap.h index d7ee84fedc..87dd8dd06c 100644 --- a/libavutil/arm/bswap.h +++ b/libavutil/arm/bswap.h @@ -27,7 +27,7 @@ #if HAVE_ARMV6 #define bswap_16 bswap_16 -static av_always_inline av_const uint16_t bswap_16(uint16_t x) +static av_always_inline av_const unsigned bswap_16(unsigned x) { __asm { rev16 x, x } return x; @@ -44,7 +44,7 @@ static av_always_inline av_const uint32_t bswap_32(uint32_t x) #if HAVE_ARMV6 #define bswap_16 bswap_16 -static av_always_inline av_const uint16_t bswap_16(uint16_t x) +static av_always_inline av_const unsigned bswap_16(unsigned x) { __asm__("rev16 %0, %0" : "+r"(x)); return x; |