diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-08 22:33:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-08 22:33:32 +0200 |
| commit | ca1f2b3e10b79958d36db296f142fbd232f997e6 (patch) | |
| tree | 4ed519b7bf7ece90209c4e2e0f1c81423bf16f19 /libavutil | |
| parent | d8ce478c43d9096bcf38b50c849e9ed45647542d (diff) | |
| parent | 66a297975d19e0d9b8a5ff8a723dcd2116a506ce (diff) | |
| download | ffmpeg-ca1f2b3e10b79958d36db296f142fbd232f997e6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cmutils: include shellapi.h on Win32 (for CommandLineToArgvW).
x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME).
id3v2: add a mimetype for bmp pictures.
flacdec: be less strict when parsing attached pictures.
flacdec: don't create an attached picture stream until we have all information.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/timer.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavutil/x86/timer.h b/libavutil/x86/timer.h index 62a111fdd3..5969876bbe 100644 --- a/libavutil/x86/timer.h +++ b/libavutil/x86/timer.h @@ -23,6 +23,8 @@ #include <stdint.h> +#if HAVE_INLINE_ASM + #define AV_READ_TIME read_time static inline uint64_t read_time(void) @@ -32,4 +34,10 @@ static inline uint64_t read_time(void) return ((uint64_t)d << 32) + a; } +#elif HAVE_RDTSC + +#define AV_READ_TIME __rdtsc + +#endif /* HAVE_INLINE_ASM */ + #endif /* AVUTIL_X86_TIMER_H */ |