Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Jul 2012 20:33:32 +0000 (22:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Jul 2012 20:33:32 +0000 (22:33 +0200)
* 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  2 
cmdutils.c
configure
libavformat/flacdec.c
libavformat/id3v2.c
libavutil/x86/timer.h

diff --cc cmdutils.c
Simple merge
diff --cc configure
+++ b/configure
@@@ -1249,10 -1119,9 +1249,11 @@@ HAVE_LIST=
      mmap
      nanosleep
      netinet_sctp_h
 +    PeekNamedPipe
      poll_h
      posix_memalign
 +    pthread_cancel
+     rdtsc
      round
      roundf
      sched_getaffinity
Simple merge
Simple merge
Simple merge