Michael Niedermayer 7cdb3b2b79 Merge commit '6869612f5c' ... * commit '6869612f5c': arm: Macroize the test for 'setend' CPU instruction support Conflicts: libavcodec/arm/h264dsp_init_arm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-07-22 12:46:13 +02:00
..
asm.S	Merge commit 'd5a5598198'	2014-06-04 12:45:35 +02:00
bswap.h	Merge commit '637606de2d'	2012-12-08 14:19:55 +01:00
cpu.c	Merge commit '7b0c7c9163'	2014-06-28 21:31:18 +02:00
cpu.h	Merge commit '6869612f5c'	2014-07-22 12:46:13 +02:00
float_dsp_arm.h	Merge commit '7ffda66fd5'	2013-08-29 16:05:04 +02:00
float_dsp_init_arm.c	Merge commit '831a118078'	2014-03-13 23:59:56 +01:00
float_dsp_init_neon.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
float_dsp_init_vfp.c	armv6: Accelerate butterflies_float	2014-07-18 01:34:38 +03:00
float_dsp_neon.S	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
float_dsp_vfp.S	armv6: Accelerate butterflies_float	2014-07-18 01:34:38 +03:00
intmath.h	Merge commit '637606de2d'	2012-12-08 14:19:55 +01:00
intreadwrite.h	Merge remote-tracking branch 'qatar/master'	2012-08-09 00:51:02 +02:00
Makefile	arm: rename ARMVFP config symbol to VFP	2012-12-07 16:54:04 +00:00
neontest.h	Merge remote-tracking branch 'qatar/master'	2014-01-11 03:08:10 +01:00
timer.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00