Michael Niedermayer 1885ffb03d Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60' ... * commit '9a07c1332cfe092b57b5758f22b686ca58806c60': parser: Move Doxygen documentation to the header files PGS subtitles: Expose forced flag x86: PMINUB: port to cpuflags Conflicts: libavcodec/avcodec.h libavcodec/pgssubdec.c libavcodec/version.h libavcodec/x86/ac3dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-11-03 14:13:45 +01:00
..
asm.h	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
bswap.h	Merge remote-tracking branch 'qatar/master'	2012-06-25 16:55:31 +02:00
cpu.c	Merge remote-tracking branch 'qatar/master'	2012-10-05 17:04:15 +02:00
cpu.h	Merge remote-tracking branch 'qatar/master'	2012-10-05 17:04:15 +02:00
cpuid.asm	Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'	2012-10-31 13:43:33 +01:00
float_dsp_init.c	Merge remote-tracking branch 'qatar/master'	2012-09-09 13:27:42 +02:00
float_dsp.asm	Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'	2012-10-31 13:43:33 +01:00
intreadwrite.h
Makefile	x86: Add YASM implementations of cpuid and xgetbv from x264	2012-10-04 19:29:14 +02:00
timer.h	Merge remote-tracking branch 'qatar/master'	2012-07-08 22:33:32 +02:00
w64xmmtest.h	Add more missing includes after removing the implicit common.h	2012-08-16 10:49:54 +03:00
x86inc.asm	Merge commit '9ce02e14f01de50fcc6f7f459544b140be66d615'	2012-11-03 13:38:38 +01:00
x86util.asm	Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'	2012-11-03 14:13:45 +01:00