6 Commits

Author	SHA1	Message	Date
Michael Niedermayer	361bc70731	Merge remote-tracking branch 'qatar/master' ... * qatar/master: avutil: Fix compilation with inline asm disabled on mingw Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-09-22 11:51:38 +02:00
Alex Smith	08fa828b3f	avutil: Fix compilation with inline asm disabled on mingw ... Because of -Werror=implicit-function-declaration the build will fail. Signed-off-by: Martin Storsjö <martin@martin.st>	2013-09-22 00:50:32 +03:00
Michael Niedermayer	ca1f2b3e10	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>	2012-07-08 22:33:32 +02:00
Ronald S. Bultje	07b287020c	x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME).	2012-07-07 13:35:07 -07:00
Mans Rullgard	2912e87a6c	Replace FFmpeg with Libav in licence headers ... Signed-off-by: Mans Rullgard <mans@mansr.com>	2011-03-19 13:33:20 +00:00
Måns Rullgård	439ccc4e0e	Split libavutil/timer.h per architecture ... Originally committed as revision 18304 to svn://svn.ffmpeg.org/ffmpeg/trunk	2009-04-01 22:56:22 +00:00