Michael Niedermayer 24604ebaf8 Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3' ...

* commit '5959bfaca396ecaf63a8123055f499688b79cae3':
  floatdsp: move butterflies_float from dsputil to avfloatdsp.

Conflicts:
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/imc.c
	libavcodec/mpegaudiodec.c

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

2013-01-23 14:13:54 +01:00

..

aac.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

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

aacpsdsp_init_arm.c

aacps: NEON optimisations

2012-05-05 22:04:21 +01:00

aacpsdsp_neon.S

ARM: Move asm.S from libavcodec to libavutil

2012-06-08 13:14:38 -04:00

ac3dsp_arm.S

ARM: Move asm.S from libavcodec to libavutil

2012-06-08 13:14:38 -04:00

ac3dsp_armv6.S

ARM: swap source operands in some add instructions

2012-09-20 17:07:18 +01:00

ac3dsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-04-22 22:26:42 +02:00

ac3dsp_neon.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

asm-offsets.h

…

dca.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

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

dcadsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-04-22 22:26:42 +02:00

dcadsp_neon.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

dsputil_arm.h

Merge remote-tracking branch 'qatar/master'

2012-03-13 01:56:33 +01:00

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 '42d324694883cdf1fff1612ac70fa403692a1ad4'

2013-01-23 14:04:50 +01:00

dsputil_init_armv5te.c

Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'

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

dsputil_init_armv6.c

dsputil/me/pixels: Actually use av_restrict

2012-09-09 03:55:56 +02:00

dsputil_init_neon.c

Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'

2013-01-23 14:13:54 +01:00

dsputil_neon.S

Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'

2013-01-23 14:13:54 +01:00

fft_fixed_init_arm.c

Merge commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52'

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

fft_fixed_neon.S

Merge remote-tracking branch 'qatar/master'

2012-07-01 22:43:09 +02:00

fft_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-04-22 22:26:42 +02:00

fft_neon.S

Merge remote-tracking branch 'qatar/master'

2012-07-01 22:43:09 +02:00

flacdsp_arm.S

Merge remote-tracking branch 'qatar/master'

2012-09-16 14:55:00 +02:00

flacdsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-09-16 14:55:00 +02:00

fmtconvert_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-04-22 22:26:42 +02:00

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

arm: fix compile with disable-optimizations on android

2012-08-07 13:31:40 +02:00

h264dsp_neon.S

Merge remote-tracking branch 'qatar/master'

2012-08-01 23:33:06 +02:00

h264idct_neon.S

Merge remote-tracking branch 'qatar/master'

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

h264pred_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-10-30 17:47:36 +01:00

h264pred_neon.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

int_neon.S

Merge remote-tracking branch 'qatar/master'

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

jrevdct_arm.S

ARM: Move asm.S from libavcodec to libavutil

2012-06-08 13:14:38 -04: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

ARM: Move asm.S from libavcodec to libavutil

2012-06-08 13:14:38 -04:00

mpegaudiodsp_init_arm.c

ARM: allow runtime masking of CPU features

2012-04-22 12:30:45 +01:00

mpegvideo_arm.c

Merge remote-tracking branch 'qatar/master'

2012-04-22 22:26:42 +02:00

mpegvideo_arm.h

Merge remote-tracking branch 'qatar/master'

2012-03-13 01:56:33 +01:00

mpegvideo_armv5te_s.S

Merge remote-tracking branch 'qatar/master'

2012-08-01 23:33:06 +02:00

mpegvideo_armv5te.c

mpegvideo_armv5te: change asserts to av_asserts

2012-10-06 04:45:57 +02:00

mpegvideo_neon.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

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 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'

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

rv34dsp_neon.S

ARM: Move asm.S from libavcodec to libavutil

2012-06-08 13:14:38 -04:00

rv40dsp_init_arm.c

Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'

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

rv40dsp_neon.S

ARM: Move asm.S from libavcodec to libavutil

2012-06-08 13:14:38 -04:00

sbrdsp_init_arm.c

ARM: allow runtime masking of CPU features

2012-04-22 12:30:45 +01:00

sbrdsp_neon.S

ARM: generate position independent code to access data symbols

2012-07-01 11:25:06 +01:00

simple_idct_arm.S

Merge remote-tracking branch 'qatar/master'

2012-08-01 23:33:06 +02:00

simple_idct_armv5te.S

Merge remote-tracking branch 'qatar/master'

2012-08-01 23:33:06 +02:00

simple_idct_armv6.S

Merge remote-tracking branch 'qatar/master'

2012-08-01 23:33:06 +02:00

simple_idct_neon.S

Merge remote-tracking branch 'qatar/master'

2012-08-01 23:33:06 +02: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 remote-tracking branch 'qatar/master'

2012-07-18 22:34:48 +02:00

vp3dsp_neon.S

Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'

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

vp8_armv6.S

Merge remote-tracking branch 'qatar/master'

2012-09-21 14:44:32 +02:00

vp8.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

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

vp8dsp_armv6.S

arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation

2012-12-07 16:54:03 +00:00

vp8dsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-04-26 22:24:58 +02:00

vp8dsp_init_armv6.c

vp8: armv6 optimisations

2012-04-25 21:41:39 +01:00

vp8dsp_init_neon.c

vp8: arm: separate ARMv6 functions from NEON

2012-04-25 21:41:39 +01:00

vp8dsp_neon.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

vp8dsp.h

vp8: arm: separate ARMv6 functions from NEON

2012-04-25 21:41:39 +01:00

vp56_arith.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

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

vp56dsp_init_arm.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

vp56dsp_neon.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00