Michael Niedermayer 7cdb3b2b79 Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c' ...

* commit '6869612f5c7d4d2f20f69a5658328a761deadb1c':
  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 'd5a55981986ac5d1a31aef3a8d16eaff8534a412'

2014-06-04 12:45:35 +02:00

bswap.h

…

cpu.c

Merge commit '7b0c7c9163fe3dd0081696befde28617119d2590'

2014-06-28 21:31:18 +02:00

cpu.h

Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'

2014-07-22 12:46:13 +02:00

float_dsp_arm.h

…

float_dsp_init_arm.c

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

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

…

intreadwrite.h

…

Makefile

…

neontest.h

Merge remote-tracking branch 'qatar/master'

2014-01-11 03:08:10 +01:00

timer.h

…