diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 11:51:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 11:51:38 +0200 |
| commit | 361bc707319d4c4f121cf5841602b073f4ec2388 (patch) | |
| tree | 76ce65eaf8eb6d352f9110dee73225d60ee62293 | |
| parent | 85f8a3cb50c3950acc8d9854880cf620c60667a5 (diff) | |
| parent | 08fa828b3fe242038c12df3e145e2c571e697d13 (diff) | |
| download | ffmpeg-361bc707319d4c4f121cf5841602b073f4ec2388.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: Fix compilation with inline asm disabled on mingw
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/x86/timer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/x86/timer.h b/libavutil/x86/timer.h index 5969876bbe..d812d46aed 100644 --- a/libavutil/x86/timer.h +++ b/libavutil/x86/timer.h @@ -36,6 +36,7 @@ static inline uint64_t read_time(void) #elif HAVE_RDTSC +#include <intrin.h> #define AV_READ_TIME __rdtsc #endif /* HAVE_INLINE_ASM */ |