• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · ca1f2b3e
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    ca1f2b3e
cmdutils.c 44.4 KB