Michael Niedermayer db4e4f766c Merge commit 'a8b6015823e628047a45916404c00044c5e80415' ...

* commit 'a8b6015823e628047a45916404c00044c5e80415':
  dsputil: convert remaining functions to use ptrdiff_t strides

Conflicts:
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/h264qpel_template.c

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

2013-03-13 14:18:53 +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

ARM: swap source operands in some add instructions

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

ac3dsp_init_arm.c

…

ac3dsp_neon.S

…

asm-offsets.h

…

dca.h

Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'

2013-02-26 12:56:55 +01:00

dcadsp_init_arm.c

…

dcadsp_neon.S

…

dsputil_arm.h

…

dsputil_arm.S

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

dsputil_armv6.S

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

dsputil_init_arm.c

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

dsputil_init_armv5te.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

dsputil_init_armv6.c

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

dsputil_init_neon.c

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

dsputil_neon.S

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

fft_fixed_init_arm.c

Only set accelerated arm fft functions if fft is enabled.

2013-02-17 17:29:55 +01:00

fft_fixed_neon.S

…

fft_init_arm.c

Only set accelerated arm fft functions if fft is enabled.

2013-02-17 17:29:55 +01:00

fft_neon.S

…

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 commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01: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

h264chroma_init_arm.c

Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'

2013-02-07 13:09:35 +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 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

h264dsp_neon.S

Merge remote-tracking branch 'qatar/master'

2013-01-24 15:47:47 +01:00

h264idct_neon.S

h264: integrate clear_blocks calls with IDCT.

2013-02-19 16:25:50 +01:00

h264pred_init_arm.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

h264pred_neon.S

…

h264qpel_init_arm.c

Merge commit 'a8b6015823e628047a45916404c00044c5e80415'

2013-03-13 14:18:53 +01:00

h264qpel_neon.S

Merge remote-tracking branch 'qatar/master'

2013-01-24 15:47:47 +01:00

hpeldsp_arm.h

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

hpeldsp_arm.S

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

hpeldsp_armv6.S

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

hpeldsp_init_arm.c

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

hpeldsp_init_armv6.c

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

hpeldsp_init_neon.c

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

hpeldsp_neon.S

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01:00

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

Move arm half-pel assembly from dsputil to hpeldsp.

2013-03-13 04:04:13 +01: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

Add av_cold attributes to arch-specific init functions

2013-02-05 17:01:05 +01:00

mpegvideo_arm.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

mpegvideo_arm.h

…

mpegvideo_armv5te_s.S

Merge remote-tracking branch 'qatar/master'

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

mpegvideo_armv5te.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +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 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'

2013-02-07 13:35:49 +01:00

rv34dsp_neon.S

Drop DCTELEM typedef

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

rv40dsp_init_arm.c

Merge commit 'a8b6015823e628047a45916404c00044c5e80415'

2013-03-13 14:18:53 +01:00

rv40dsp_neon.S

…

sbrdsp_init_arm.c

…

sbrdsp_neon.S

…

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

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

videodsp_init_armv5te.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

vorbisdsp_init_arm.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

vorbisdsp_neon.S

Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'

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

vp3dsp_init_arm.c

vp3/x86: use full transpose for all IDCTs.

2013-03-12 22:54:10 +01: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 remote-tracking branch 'qatar/master'

2013-02-21 12:59:38 +01:00

vp8dsp_armv6.S

arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht

2013-01-27 13:17:25 +02: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

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

vp56dsp_neon.S

…