Michael Niedermayer 21dfabfa64 Merge commit 'adff0a8166345bb9513f0f658043fb6387e90122' ... * commit 'adff0a8166345bb9513f0f658043fb6387e90122': arm: dsputil: Coalesce all init files Conflicts: libavcodec/arm/Makefile libavcodec/arm/dsputil_arm.h libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-07-16 20:09:25 +02:00
..
Makefile	Merge commit 'adff0a8166345bb9513f0f658043fb6387e90122'	2014-07-16 20:09:25 +02:00
aac.h	…
aacpsdsp_init_arm.c	…
aacpsdsp_neon.S	…
ac3dsp_arm.S	…
ac3dsp_armv6.S	…
ac3dsp_init_arm.c	…
ac3dsp_neon.S	…
asm-offsets.h	Merge commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1'	2014-04-30 00:23:01 +02:00
audiodsp_arm.h	Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'	2014-06-22 17:58:28 +02:00
audiodsp_init_arm.c	Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'	2014-06-22 17:58:28 +02:00
audiodsp_init_neon.c	Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'	2014-06-22 17:58:28 +02:00
audiodsp_neon.S	Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'	2014-06-22 17:58:28 +02:00
blockdsp_arm.h	Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'	2014-06-19 04:54:38 +02:00
blockdsp_init_arm.c	Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'	2014-06-19 04:54:38 +02:00
blockdsp_init_neon.c	Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'	2014-06-19 04:54:38 +02:00
blockdsp_neon.S	Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'	2014-06-19 04:54:38 +02:00
cabac.h	…
dca.h	…
dcadsp_init_arm.c	…
dcadsp_neon.S	…
dcadsp_vfp.S	…
dsputil_armv6.S	Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'	2014-07-10 01:22:14 +02:00
dsputil_init_arm.c	Merge commit 'adff0a8166345bb9513f0f658043fb6387e90122'	2014-07-16 20:09:25 +02:00
fft_fixed_init_arm.c	…
fft_fixed_neon.S	…
fft_init_arm.c	…
fft_neon.S	…
fft_vfp.S	…
flacdsp_arm.S	…
flacdsp_init_arm.c	…
fmtconvert_init_arm.c	…
fmtconvert_neon.S	…
fmtconvert_vfp.S	…
fmtconvert_vfp_armv6.S	…
h264chroma_init_arm.c	…
h264cmc_neon.S	Merge commit 'f23d26a6864128001b03876b0b92fffe131f2060'	2014-06-23 20:35:33 +02:00
h264dsp_init_arm.c	Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'	2014-07-08 14:44:12 +02:00
h264dsp_neon.S	…
h264idct_neon.S	…
h264pred_init_arm.c	Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'	2014-04-04 14:46:10 +02:00
h264pred_neon.S	…
h264qpel_init_arm.c	…
h264qpel_neon.S	…
hpeldsp_arm.S	…
hpeldsp_arm.h	…
hpeldsp_armv6.S	…
hpeldsp_init_arm.c	…
hpeldsp_init_armv6.c	…
hpeldsp_init_neon.c	…
hpeldsp_neon.S	…
idctdsp_arm.S	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
idctdsp_arm.h	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
idctdsp_armv6.S	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
idctdsp_init_arm.c	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
idctdsp_init_armv5te.c	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
idctdsp_init_armv6.c	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
idctdsp_init_neon.c	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
idctdsp_neon.S	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
int_neon.S	Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'	2014-05-30 00:59:15 +02:00
jrevdct_arm.S	…
lossless_audiodsp_init_arm.c	apedsp: move to llauddsp	2014-06-05 20:31:59 +02:00
lossless_audiodsp_neon.S	apedsp: move to llauddsp	2014-06-05 20:31:59 +02:00
mathops.h	…
mdct_fixed_neon.S	…
mdct_neon.S	…
mdct_vfp.S	armv6: Accelerate ff_imdct_half for general case (mdct_bits != 6)	2014-07-13 15:17:04 +02:00
mlpdsp_armv5te.S	…
mlpdsp_armv6.S	…
mlpdsp_init_arm.c	…
mpegaudiodsp_fixed_armv6.S	…
mpegaudiodsp_init_arm.c	…
mpegvideo_arm.c	Merge commit 'a88e1d1c598e641eecd5d43730211d91c82787c6'	2014-04-25 00:55:40 +02:00
mpegvideo_arm.h	…
mpegvideo_armv5te.c	…
mpegvideo_armv5te_s.S	…
mpegvideo_neon.S	…
mpegvideoencdsp_armv6.S	Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'	2014-07-07 15:36:58 +02:00
mpegvideoencdsp_init_arm.c	Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'	2014-07-07 15:36:58 +02:00
neon.S	…
neontest.c	…
pixblockdsp_armv6.S	Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'	2014-07-10 01:22:14 +02:00
pixblockdsp_init_arm.c	Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'	2014-07-10 01:22:14 +02:00
rdft_neon.S	…
rv34dsp_init_arm.c	…
rv34dsp_neon.S	…
rv40dsp_init_arm.c	…
rv40dsp_neon.S	…
sbrdsp_init_arm.c	…
sbrdsp_neon.S	…
simple_idct_arm.S	…
simple_idct_armv5te.S	…
simple_idct_armv6.S	…
simple_idct_neon.S	…
startcode_armv6.S	h264: Move search code search functions into separate source files.	2014-04-25 02:35:56 +02:00
synth_filter_neon.S	…
synth_filter_vfp.S	…
vc1dsp.h	…
vc1dsp_init_arm.c	vc-1: Add platform-specific start code search routine to VC1DSPContext.	2014-04-25 02:36:11 +02:00
vc1dsp_init_neon.c	Merge commit '896a5bff64264f4d01ed98eacc97a67260c1e17e'	2014-06-03 18:19:21 +02:00
vc1dsp_neon.S	Merge commit '896a5bff64264f4d01ed98eacc97a67260c1e17e'	2014-06-03 18:19:21 +02:00
videodsp_arm.h	…
videodsp_armv5te.S	…
videodsp_init_arm.c	…
videodsp_init_armv5te.c	…
vorbisdsp_init_arm.c	…
vorbisdsp_neon.S	…
vp3dsp_init_arm.c	Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'	2014-04-05 18:54:15 +02:00
vp3dsp_neon.S	…
vp6dsp_init_arm.c	…
vp6dsp_neon.S	…
vp8.h	arm: asm decode_block_coeffs_internal is vp8 specific	2014-04-04 10:39:29 +02:00
vp8_armv6.S	…
vp8dsp.h	Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'	2014-04-04 14:46:10 +02:00
vp8dsp_armv6.S	…
vp8dsp_init_arm.c	Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'	2014-04-04 14:46:10 +02:00
vp8dsp_init_armv6.c	Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'	2014-04-04 14:46:10 +02:00
vp8dsp_init_neon.c	Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'	2014-04-04 14:46:10 +02:00
vp8dsp_neon.S	…
vp56_arith.h	…