Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Fix compilation with inline asm disabled on mingw

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-22 11:51:18 +02:00
commit 361bc70731
1 changed files with 1 additions and 0 deletions

View File

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