Michael Niedermayer 9d01bf7d66 Merge remote-tracking branch 'qatar/master' ... * qatar/master: Consistently use "cpu_flags" as variable/parameter name for CPU flags Conflicts: libavcodec/x86/dsputil_init.c libavcodec/x86/h264dsp_init.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/motion_est.c libavcodec/x86/mpegvideo.c libavcodec/x86/proresdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-07-18 09:53:47 +02:00
..
asm.h	dsputil: Make dsputil selectable	2013-04-10 11:04:05 +03: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 remote-tracking branch 'qatar/master'	2013-07-18 09:53:47 +02:00
float_dsp.asm	Merge commit '566b7a20fd0cab44d344329538d314454a0bcc2f'	2013-05-03 11:57:59 +02:00
intreadwrite.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
lls_init.c	avutil/x86: reenable ff_update_lls_avx()	2013-07-02 12:02:08 +02:00
lls.asm	avutil/x86: reenable ff_update_lls_avx()	2013-07-02 12:02:08 +02:00
Makefile	x86: lpc: simd av_update_lls	2013-06-29 13:23:57 +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	x86inc: Fix number of operands for cmp* instructions	2013-04-09 23:55:30 +02:00
x86util.asm	Merge commit 'd633d12b2cc999cee3ac25bf9a810fe7ff03726d'	2013-01-19 13:11:41 +01:00