Michael Niedermayer 63a97d5674 Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' ... * commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa': cosmetics: Remove unnecessary extern keywords from function declarations Conflicts: libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-03-28 11:20:41 +01:00
..
asm.h	dsputil: make selectable.	2013-03-12 19:56:58 +01:00
bswap.h	Merge remote-tracking branch 'qatar/master'	2012-06-25 16:55:31 +02:00
cpu.c	Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'	2012-11-28 13:32:17 +01: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
emms.asm	Merge remote-tracking branch 'qatar/master'	2013-01-19 13:20:25 +01:00
emms.h	lavu: Fix checkheaders for x86/emms.h	2013-02-17 00:18:16 +01:00
float_dsp_init.c	Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'	2013-03-28 11:20:41 +01:00
float_dsp.asm	Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'	2013-01-23 14:31:55 +01:00
intreadwrite.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
Makefile	x86: Add a Yasm-based emms() replacement	2013-01-18 22:02:13 +01: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	x86: Use simple nop codes for <= sse (rather than <= mmx)	2013-02-19 22:33:19 +02:00
x86util.asm	Merge commit 'd633d12b2cc999cee3ac25bf9a810fe7ff03726d'	2013-01-19 13:11:41 +01:00