Michael Niedermayer 7e90053822 Merge remote-tracking branch 'qatar/master' ... * qatar/master: mpegvideo: increase edge_emu_buffer size for VC1 lavc: merge latest x86inc.asm fixes with x264 Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-12-20 02:51:35 +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 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
float_dsp_init.c	Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'	2012-12-06 14:33:38 +01:00
float_dsp.asm	Merge remote-tracking branch 'qatar/master'	2012-12-08 16:36:47 +01:00
intreadwrite.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
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 remote-tracking branch 'qatar/master'	2012-12-20 02:51:35 +01:00
x86util.asm	Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'	2012-12-06 14:33:38 +01:00