[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Sun Jul 8 22:38:56 CEST 2012

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul  8 22:33:32 2012 +0200| [ca1f2b3e10b79958d36db296f142fbd232f997e6] | committer: Michael Niedermayer

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.


Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca1f2b3e10b79958d36db296f142fbd232f997e6

More information about the ffmpeg-cvslog mailing list