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)
commitca1f2b3e10b79958d36db296f142fbd232f997e6
tree4ed519b7bf7ece90209c4e2e0f1c81423bf16f19
parentd8ce478c43d9096bcf38b50c849e9ed45647542d
parent66a297975d19e0d9b8a5ff8a723dcd2116a506ce
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>
cmdutils.c
configure
libavformat/flacdec.c
libavformat/id3v2.c
libavutil/x86/timer.h