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>

1 files changed, 3 insertions, 0 deletions

diff --git a/configure b/configure
index 8a318da6db..abafd6ef93 100755
--- a/configure
+++ b/configure
@@ -1253,6 +1253,7 @@ HAVE_LIST="
     poll_h
     posix_memalign
     pthread_cancel
+    rdtsc
     round
     roundf
     sched_getaffinity
@@ -2947,6 +2948,8 @@ check_cc <<EOF && enable inline_asm
 void foo(void) { __asm__ volatile ("" ::); }
 EOF
 
+check_code cc intrin.h "__rdtsc()" && enable rdtsc
+
 _restrict=
 for restrict_keyword in restrict __restrict__ __restrict; do
     check_cc <<EOF && _restrict=$restrict_keyword && break