Michael Niedermayer ac8987591f Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' ...

* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
  Drop DCTELEM typedef

Conflicts:
	libavcodec/alpha/dsputil_alpha.h
	libavcodec/alpha/motion_est_alpha.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/bfin/dsputil_bfin.h
	libavcodec/bfin/pixels_bfin.S
	libavcodec/cavs.c
	libavcodec/cavsdec.c
	libavcodec/dct-test.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/eamad.c
	libavcodec/h264_cavlc.c
	libavcodec/h264idct_template.c
	libavcodec/mpeg12.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/ppc/dsputil_altivec.c
	libavcodec/proresdsp.c

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

2013-01-23 17:44:56 +01:00

..

aac.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

2012-12-08 14:19:55 +01:00

aacpsdsp_init_arm.c

…

aacpsdsp_neon.S

…

ac3dsp_arm.S

…

ac3dsp_armv6.S

…

ac3dsp_init_arm.c

…

ac3dsp_neon.S

…

asm-offsets.h

…

dca.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

2012-12-08 14:19:55 +01:00

dcadsp_init_arm.c

…

dcadsp_neon.S

…

dsputil_arm.h

…

dsputil_arm.S

Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'

2012-12-21 17:18:43 +01:00

dsputil_armv6.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +02:00

dsputil_init_arm.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputil_init_armv5te.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputil_init_armv6.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputil_init_neon.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputil_neon.S

Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'

2013-01-23 14:31:55 +01:00

fft_fixed_init_arm.c

Merge commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52'

2012-12-08 13:49:26 +01:00

fft_fixed_neon.S

…

fft_init_arm.c

…

fft_neon.S

…

flacdsp_arm.S

…

flacdsp_init_arm.c

…

fmtconvert_init_arm.c

…

fmtconvert_neon.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +02:00

fmtconvert_vfp.S

Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'

2012-12-19 14:28:58 +01:00

h264cmc_neon.S

ARM: fix overreads in neon h264 chroma mc

2012-10-20 01:28:38 +01:00

h264dsp_init_arm.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

h264dsp_neon.S

…

h264idct_neon.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +02:00

h264pred_init_arm.c

Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'

2013-01-23 14:31:55 +01:00

h264pred_neon.S

…

int_neon.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +02:00

jrevdct_arm.S

Drop DCTELEM typedef

2013-01-22 18:32:56 -08:00

Makefile

floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.

2013-01-22 11:55:42 -08:00

mathops.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

2012-12-08 14:19:55 +01:00

mdct_fixed_neon.S

ARM: set Tag_ABI_align_preserved in all asm files

2012-10-02 19:47:56 +01:00

mdct_neon.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +02:00

mpegaudiodsp_fixed_armv6.S

…

mpegaudiodsp_init_arm.c

…

mpegvideo_arm.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

mpegvideo_arm.h

…

mpegvideo_armv5te_s.S

…

mpegvideo_armv5te.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

mpegvideo_neon.S

…

neon.S

…

rdft_neon.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +02:00

rv34dsp_init_arm.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

rv34dsp_neon.S

Drop DCTELEM typedef

2013-01-22 18:32:56 -08:00

rv40dsp_init_arm.c

Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'

2012-10-11 14:03:12 +02:00

rv40dsp_neon.S

…

sbrdsp_init_arm.c

…

sbrdsp_neon.S

…

simple_idct_arm.S

…

simple_idct_armv5te.S

…

simple_idct_armv6.S

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

simple_idct_neon.S

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

synth_filter_neon.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +02:00

videodsp_arm.h

videodsp: Fix project name

2012-12-22 00:58:08 +01:00

videodsp_armv5te.S

Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'

2013-01-21 13:38:57 +01:00

videodsp_init_arm.c

videodsp: Fix project name

2012-12-22 00:58:08 +01:00

videodsp_init_armv5te.c

videodsp: Fix project name

2012-12-22 00:58:08 +01:00

vorbisdsp_init_arm.c

Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'

2013-01-21 16:28:04 +01:00

vorbisdsp_neon.S

Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'

2013-01-20 14:13:16 +01:00

vp3dsp_init_arm.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vp3dsp_neon.S

Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'

2013-01-20 13:57:10 +01:00

vp8_armv6.S

…

vp8.h

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vp8dsp_armv6.S

Drop DCTELEM typedef

2013-01-22 18:32:56 -08:00

vp8dsp_init_arm.c

Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'

2013-01-23 14:31:55 +01:00

vp8dsp_init_armv6.c

Drop DCTELEM typedef

2013-01-22 18:32:56 -08:00

vp8dsp_init_neon.c

Drop DCTELEM typedef

2013-01-22 18:32:56 -08:00

vp8dsp_neon.S

…

vp8dsp.h

…

vp56_arith.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

2012-12-08 14:19:55 +01:00

vp56dsp_init_arm.c

…

vp56dsp_neon.S

…