Michael Niedermayer 8e70fdab36 Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3' ...

* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
  dsputil: Move apply_window_int16 to ac3dsp

Conflicts:
	libavcodec/arm/ac3dsp_init_arm.c
	libavcodec/arm/ac3dsp_neon.S
	libavcodec/x86/ac3dsp_init.c

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

2013-12-09 04:12:40 +01:00

..

aac.h

…

aacpsdsp_init_arm.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

aacpsdsp_neon.S

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

ac3dsp_arm.S

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

ac3dsp_armv6.S

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

ac3dsp_init_arm.c

Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'

2013-12-09 04:12:40 +01:00

ac3dsp_neon.S

Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'

2013-12-09 04:12:40 +01:00

asm-offsets.h

…

dca.h

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

dcadsp_init_arm.c

Merge commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7'

2013-08-29 16:00:45 +02:00

dcadsp_neon.S

…

dcadsp_vfp.S

…

dsputil_arm.h

…

dsputil_arm.S

…

dsputil_armv6.S

…

dsputil_init_arm.c

…

dsputil_init_armv5te.c

…

dsputil_init_armv6.c

…

dsputil_init_neon.c

Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'

2013-12-09 04:12:40 +01:00

dsputil_neon.S

Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'

2013-12-09 04:12:40 +01:00

fft_fixed_init_arm.c

…

fft_fixed_neon.S

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

fft_init_arm.c

Merge commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7'

2013-08-29 16:00:45 +02:00

fft_neon.S

…

fft_vfp.S

…

flacdsp_arm.S

…

flacdsp_init_arm.c

…

fmtconvert_init_arm.c

Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc'

2013-08-29 16:10:39 +02:00

fmtconvert_neon.S

…

fmtconvert_vfp_armv6.S

Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc'

2013-08-29 16:10:39 +02:00

fmtconvert_vfp.S

Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc'

2013-08-29 16:10:39 +02:00

h264chroma_init_arm.c

…

h264cmc_neon.S

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

h264dsp_armv6.S

Merge remote-tracking branch 'qatar/master'

2013-08-08 12:52:35 +02:00

h264dsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2013-08-08 12:52:35 +02:00

h264dsp_neon.S

…

h264idct_neon.S

…

h264pred_init_arm.c

…

h264pred_neon.S

…

h264qpel_init_arm.c

…

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

…

int_neon.S

…

jrevdct_arm.S

…

Makefile

arm: fmtconvert: Split armv6 fmtconvert code off from vfp code

2013-08-29 11:24:14 +02:00

mathops.h

…

mdct_fixed_neon.S

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

mdct_neon.S

…

mdct_vfp.S

…

mpegaudiodsp_fixed_armv6.S

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

mpegaudiodsp_init_arm.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

mpegvideo_arm.c

…

mpegvideo_arm.h

…

mpegvideo_armv5te_s.S

…

mpegvideo_armv5te.c

…

mpegvideo_neon.S

…

neon.S

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

rdft_neon.S

…

rv34dsp_init_arm.c

…

rv34dsp_neon.S

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

rv40dsp_init_arm.c

…

rv40dsp_neon.S

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

sbrdsp_init_arm.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

sbrdsp_neon.S

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

simple_idct_arm.S

…

simple_idct_armv5te.S

…

simple_idct_armv6.S

…

simple_idct_neon.S

…

synth_filter_neon.S

…

synth_filter_vfp.S

…

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

Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'

2013-08-24 11:04:11 +02:00

vp6dsp_neon.S

Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'

2013-08-24 11:04:11 +02:00

vp8_armv6.S

…

vp8.h

…

vp8dsp_armv6.S

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

vp8dsp_init_arm.c

…

vp8dsp_init_armv6.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

vp8dsp_init_neon.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

vp8dsp_neon.S

vp8: use 2 registers for dst_stride and src_stride in neon bilin filter.

2013-09-28 20:25:29 -04:00

vp8dsp.h

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

vp56_arith.h

…