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 /libavcodec/x86/mathops.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 'libavcodec/x86/mathops.h')
-rw-r--r-- | libavcodec/x86/mathops.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h index 33d9a6c8ff..78f37f24eb 100644 --- a/libavcodec/x86/mathops.h +++ b/libavcodec/x86/mathops.h @@ -25,6 +25,8 @@ #include "config.h" #include "libavutil/common.h" +#if HAVE_INLINE_ASM + #if ARCH_X86_32 #define MULL MULL @@ -118,4 +120,5 @@ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ return a; } +#endif /* HAVE_INLINE_ASM */ #endif /* AVCODEC_X86_MATHOPS_H */ |