diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-12-01 16:41:39 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-12-07 16:54:03 +0000 |
| commit | a7831d509f8db397f74895dca3dd3b4ac791ef03 (patch) | |
| tree | 22cac51b499ab8c14039ac79cc78b8b75c6089f3 /libavutil/arm/bswap.h | |
| parent | 7f2b3dcabd108926bde819ad574017f4161d1546 (diff) | |
| download | ffmpeg-a7831d509f8db397f74895dca3dd3b4ac791ef03.tar.gz | |
arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation
These macros reflect the actual capabilities required here.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavutil/arm/bswap.h')
| -rw-r--r-- | libavutil/arm/bswap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/arm/bswap.h b/libavutil/arm/bswap.h index e49cdd4640..8bc7d9a8f7 100644 --- a/libavutil/arm/bswap.h +++ b/libavutil/arm/bswap.h @@ -35,7 +35,7 @@ static av_always_inline av_const uint32_t av_bswap32(uint32_t x) #elif HAVE_INLINE_ASM -#if HAVE_ARMV6 +#if HAVE_ARMV6_INLINE #define av_bswap16 av_bswap16 static av_always_inline av_const unsigned av_bswap16(unsigned x) { @@ -48,7 +48,7 @@ static av_always_inline av_const unsigned av_bswap16(unsigned x) #define av_bswap32 av_bswap32 static av_always_inline av_const uint32_t av_bswap32(uint32_t x) { -#if HAVE_ARMV6 +#if HAVE_ARMV6_INLINE __asm__("rev %0, %0" : "+r"(x)); #else uint32_t t; @@ -57,7 +57,7 @@ static av_always_inline av_const uint32_t av_bswap32(uint32_t x) "mov %0, %0, ror #8 \n\t" "eor %0, %0, %1, lsr #8 \n\t" : "+r"(x), "=&r"(t)); -#endif /* HAVE_ARMV6 */ +#endif /* HAVE_ARMV6_INLINE */ return x; } #endif /* !AV_GCC_VERSION_AT_LEAST(4,5) */ |