Michael Niedermayer 3a2d1465c8 Merge commit '2d60444331fca1910510038dd3817bea885c2367' ... * commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-07-17 23:27:40 +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
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
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_armv6.S
fmtconvert_vfp.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
h264pred_neon.S
h264qpel_init_arm.c
h264qpel_neon.S
hpeldsp_arm.h
hpeldsp_arm.S
hpeldsp_armv6.S
hpeldsp_init_arm.c
hpeldsp_init_armv6.c
hpeldsp_init_neon.c
hpeldsp_neon.S
idctdsp_arm.h	Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'	2014-07-01 15:22:11 +02:00
idctdsp_arm.S	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
Makefile	Merge commit '2d60444331fca1910510038dd3817bea885c2367'	2014-07-17 23:27:40 +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
me_cmp_armv6.S	Merge commit '2d60444331fca1910510038dd3817bea885c2367'	2014-07-17 23:27:40 +02:00
me_cmp_init_arm.c	Merge commit '2d60444331fca1910510038dd3817bea885c2367'	2014-07-17 23:27:40 +02:00
mlpdsp_armv5te.S
mlpdsp_armv6.S
mlpdsp_init_arm.c
mpegaudiodsp_fixed_armv6.S
mpegaudiodsp_init_arm.c
mpegvideo_arm.c
mpegvideo_arm.h
mpegvideo_armv5te_s.S
mpegvideo_armv5te.c
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
synth_filter_neon.S
synth_filter_vfp.S
vc1dsp_init_arm.c
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
vc1dsp.h
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
vp3dsp_neon.S
vp6dsp_init_arm.c
vp6dsp_neon.S
vp8_armv6.S
vp8.h
vp8dsp_armv6.S
vp8dsp_init_arm.c
vp8dsp_init_armv6.c
vp8dsp_init_neon.c
vp8dsp_neon.S
vp8dsp.h
vp56_arith.h