Michael Niedermayer 40f3a87c10 Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3' ...

* commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3':
  dsputil: Move APE-specific bits into apedsp

Conflicts:
	libavcodec/arm/int_neon.S
	libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-05-30 00:59:15 +02:00

..

aac.h

…

aacpsdsp_init_arm.c

…

aacpsdsp_neon.S

…

ac3dsp_arm.S

…

ac3dsp_armv6.S

…

ac3dsp_init_arm.c

…

ac3dsp_neon.S

…

apedsp_init_arm.c

Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'

2014-05-30 00:59:15 +02:00

apedsp_neon.S

Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'

2014-05-30 00:59:15 +02:00

asm-offsets.h

Merge commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1'

2014-04-30 00:23:01 +02:00

cabac.h

avcodec/arm/cabac: fix inline cabac reader with the UNCHECKED bitstream reader

2014-03-15 01:08:45 +01:00

dca.h

Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'

2014-02-28 21:41:19 +01:00

dcadsp_init_arm.c

Merge commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b'

2014-02-28 21:52:25 +01:00

dcadsp_neon.S

Merge commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b'

2014-02-28 21:52:25 +01:00

dcadsp_vfp.S

Merge commit '87ec849fe9acba075c843e67bcd01f256f481a18'

2014-02-28 18:14:12 +01:00

dsputil_arm.h

Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'

2014-03-20 22:06:01 +01:00

dsputil_arm.S

…

dsputil_armv6.S

…

dsputil_init_arm.c

Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'

2014-03-20 22:06:01 +01:00

dsputil_init_armv5te.c

Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'

2014-03-20 22:06:01 +01:00

dsputil_init_armv6.c

Merge commit '82bb3048013201c0095d2853d4623633d912252f'

2014-03-20 22:36:40 +01:00

dsputil_init_neon.c

Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'

2014-05-30 00:59:15 +02:00

dsputil_neon.S

…

fft_fixed_init_arm.c

…

fft_fixed_neon.S

avcodec/arm/fft_fixed_neon: reduce diff by 2 spaces to libav

2014-03-14 14:28:28 +01:00

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

…

h264dsp_init_arm.c

h264: Move search code search functions into separate source files.

2014-04-25 02:35:56 +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.h

…

hpeldsp_arm.S

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

2014-03-13 23:59:56 +01:00

hpeldsp_armv6.S

Merge commit '61985ad72c47bbb668f2d3923bf5c9df83e79323'

2014-03-09 01:16:21 +01:00

hpeldsp_init_arm.c

Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'

2014-03-22 22:53:33 +01:00

hpeldsp_init_armv6.c

…

hpeldsp_init_neon.c

…

hpeldsp_neon.S

…

int_neon.S

Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'

2014-05-30 00:59:15 +02:00

jrevdct_arm.S

…

Makefile

Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'

2014-05-30 00:59:15 +02:00

mathops.h

…

mdct_fixed_neon.S

…

mdct_neon.S

…

mdct_vfp.S

…

mlpdsp_armv5te.S

truehd: add hand-scheduled ARM asm version of ff_mlp_rematrix_channel.

2014-03-26 20:50:05 +01:00

mlpdsp_armv6.S

Merge remote-tracking branch 'qatar/master'

2014-03-26 21:23:09 +01:00

mlpdsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2014-03-26 21:23:09 +01:00

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_s.S

…

mpegvideo_armv5te.c

…

mpegvideo_neon.S

…

neon.S

…

neontest.c

…

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_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

avcodec/arm/vc1dsp_init_neon: fix code so it compiles and passes fate-vc1

2014-04-20 20:32:21 +02:00

vc1dsp_neon.S

…

vc1dsp.h

…

videodsp_arm.h

…

videodsp_armv5te.S

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

2014-03-13 23:59:56 +01:00

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_armv6.S

…

vp8.h

arm: asm decode_block_coeffs_internal is vp8 specific

2014-04-04 10:39:29 +02:00

vp8dsp_armv6.S

Merge commit '5a7f382a5d33d9a26890affe6c8c5070a48dfc22'

2014-03-12 22:03:00 +01:00

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

…

vp8dsp.h

Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'

2014-04-04 14:46:10 +02:00

vp56_arith.h

…