diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-25 16:55:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-25 16:55:31 +0200 |
commit | a6ff8514a9bdc93739a73d28913c6b457baff32d (patch) | |
tree | ed4f3c885586b33b7d8229e606acc80cd8c8ca50 /libavutil/x86/bswap.h | |
parent | fec512a52cdd1bab84958474cc160fdb7be81dec (diff) | |
parent | dc5385806339f90b4eb074d9002205ebb4010cc2 (diff) | |
download | ffmpeg-a6ff8514a9bdc93739a73d28913c6b457baff32d.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wtv: Check the return value from gmtime
x86: fft: convert sse inline asm to yasm
x86: place some inline asm under #if HAVE_INLINE_ASM
Conflicts:
libavcodec/x86/fft_sse.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/bswap.h')
-rw-r--r-- | libavutil/x86/bswap.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/x86/bswap.h b/libavutil/x86/bswap.h index 52ffb4dbf8..08e2a62520 100644 --- a/libavutil/x86/bswap.h +++ b/libavutil/x86/bswap.h @@ -28,6 +28,8 @@ #include "config.h" #include "libavutil/attributes.h" +#if HAVE_INLINE_ASM + #if !AV_GCC_VERSION_AT_LEAST(4,1) #define av_bswap16 av_bswap16 static av_always_inline av_const unsigned av_bswap16(unsigned x) @@ -55,4 +57,5 @@ static inline uint64_t av_const av_bswap64(uint64_t x) #endif #endif /* !AV_GCC_VERSION_AT_LEAST(4,5) */ +#endif /* HAVE_INLINE_ASM */ #endif /* AVUTIL_X86_BSWAP_H */ |