Michael Niedermayer ea41e6d637 Merge commit '9c12c6ff9539e926df0b2a2299e915ae71872600' ...

* commit '9c12c6ff9539e926df0b2a2299e915ae71872600':
  motion_est: convert stride to ptrdiff_t

Conflicts:
	libavcodec/me_cmp.c
	libavcodec/ppc/me_cmp.c
	libavcodec/x86/me_cmp_init.c

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

2014-11-24 12:13:00 +01: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

…

audiodsp_init_arm.c

…

audiodsp_init_neon.c

…

audiodsp_neon.S

…

blockdsp_arm.h

…

blockdsp_init_arm.c

…

blockdsp_init_neon.c

…

blockdsp_neon.S

…

cabac.h

…

dca.h

…

dcadsp_init_arm.c

…

dcadsp_neon.S

…

dcadsp_vfp.S

…

dct-test.c

Merge commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce'

2014-07-21 13:33:51 +02:00

fft_fixed_init_arm.c

…

fft_fixed_neon.S

…

fft_init_arm.c

Merge commit '87552d54d3337c3241e8a9e1a05df16eaa821496'

2014-07-18 03:12:02 +02:00

fft_neon.S

…

fft_vfp.S

Merge commit '87552d54d3337c3241e8a9e1a05df16eaa821496'

2014-07-18 03:12:02 +02:00

flacdsp_arm.S

…

flacdsp_init_arm.c

x86/flacdsp: add SSE2 and AVX decorrelate functions

2014-11-13 13:47:55 -03:00

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

Fix compile error on arm4/arm5 platform

2014-09-23 21:11:05 +02:00

h264dsp_neon.S

…

h264idct_neon.S

…

h264pred_init_arm.c

…

h264pred_neon.S

…

h264qpel_init_arm.c

Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'

2014-07-25 13:05:08 +02:00

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

…

idct.h

Merge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'

2014-07-21 01:56:22 +02:00

idctdsp_arm.h

…

idctdsp_arm.S

avcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size

2014-09-24 21:43:19 -03:00

idctdsp_armv6.S

…

idctdsp_init_arm.c

avcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size

2014-09-24 21:43:19 -03:00

idctdsp_init_armv5te.c

Merge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'

2014-07-21 01:56:22 +02:00

idctdsp_init_armv6.c

avcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size

2014-09-24 21:43:19 -03:00

idctdsp_init_neon.c

avcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size

2014-09-24 21:43:19 -03:00

idctdsp_neon.S

…

int_neon.S

…

jrevdct_arm.S

…

lossless_audiodsp_init_arm.c

…

lossless_audiodsp_neon.S

…

Makefile

Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'

2014-08-15 20:25:12 +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-18 01:34:08 +03:00

me_cmp_armv6.S

Merge commit '2d60444331fca1910510038dd3817bea885c2367'

2014-07-17 23:27:40 +02:00

me_cmp_init_arm.c

Merge commit '9c12c6ff9539e926df0b2a2299e915ae71872600'

2014-11-24 12:13:00 +01:00

mlpdsp_armv5te.S

Merge commit '7e18a727d2c2a19f22fcf68875d1b05fd2eafcef'

2014-07-18 13:17:29 +02:00

mlpdsp_armv6.S

…

mlpdsp_init_arm.c

…

mpegaudiodsp_fixed_armv6.S

…

mpegaudiodsp_init_arm.c

…

mpegvideo_arm.c

Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'

2014-08-15 20:11:56 +02:00

mpegvideo_arm.h

Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'

2014-08-15 20:11:56 +02:00

mpegvideo_armv5te_s.S

…

mpegvideo_armv5te.c

Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'

2014-08-15 20:11:56 +02:00

mpegvideo_neon.S

…

mpegvideoencdsp_armv6.S

…

mpegvideoencdsp_init_arm.c

…

neon.S

…

neontest.c

…

pixblockdsp_armv6.S

…

pixblockdsp_init_arm.c

avcodec: Change get_pixels() to ptrdiff_t linesize

2014-08-06 15:50:54 +02:00

rdft_neon.S

…

rv34dsp_init_arm.c

…

rv34dsp_neon.S

…

rv40dsp_init_arm.c

Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'

2014-07-25 13:05:08 +02:00

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 start code search functions into separate source files.

2014-08-04 22:22:54 +02:00

startcode.h

Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'

2014-08-05 12:46:10 +02:00

synth_filter_neon.S

…

synth_filter_vfp.S

Merge commit '7e18a727d2c2a19f22fcf68875d1b05fd2eafcef'

2014-07-18 13:17:29 +02:00

vc1dsp_init_arm.c

Fix compile error on arm4/arm5 platform

2014-09-23 21:11:05 +02:00

vc1dsp_init_neon.c

…

vc1dsp_neon.S

…

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

…