Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Fix compilation with inline asm disabled on mingw
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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 */