Michael Niedermayer 9ef7c0c551 Merge commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f' ...

* commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f':
  arm: cosmetics: Reindent the h264dsp neon init function

Conflicts:
	libavcodec/arm/h264dsp_init_arm.c

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

2014-01-08 05:13:25 +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

arm: Mangle external symbols properly in new vfp assembly files

2013-07-22 14:48:30 +03:00

dsputil_arm.h

…

dsputil_arm.S

arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

2013-04-19 23:19:08 +03:00

dsputil_armv6.S

arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

2013-04-19 23:19:08 +03:00

dsputil_init_arm.c

arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

2013-04-19 23:19:08 +03:00

dsputil_init_armv5te.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

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

dsputil_init_armv6.c

arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

2013-04-19 23:19:08 +03:00

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

Merge commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3'

2014-01-07 13:10:56 +01:00

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

Merge commit '8b9eba664edaddf9a304d3acbf0388b5c520781d'

2013-07-22 12:05:39 +02:00

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

Merge commit 'b254490bdabb21bd517c05b1a68717f9952ac8c4'

2013-12-20 23:33:15 +01:00

h264dsp_armv6.S

Merge remote-tracking branch 'qatar/master'

2014-01-04 13:19:54 +01:00

h264dsp_init_arm.c

Merge commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f'

2014-01-08 05:13:25 +01:00

h264dsp_neon.S

…

h264idct_neon.S

Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'

2013-04-11 11:53:19 +02:00

h264pred_init_arm.c

Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'

2013-05-01 18:21:35 +02:00

h264pred_neon.S

…

h264qpel_init_arm.c

Merge commit 'a8b6015823e628047a45916404c00044c5e80415'

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

h264qpel_neon.S

…

hpeldsp_arm.h

Merge commit '7384b7a71338d960e421d6dc3d77da09b0a442cb'

2013-04-20 14:19:08 +02:00

hpeldsp_arm.S

arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

2013-04-19 23:19:08 +03:00

hpeldsp_armv6.S

arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

2013-04-19 23:19:08 +03:00

hpeldsp_init_arm.c

Merge commit '7384b7a71338d960e421d6dc3d77da09b0a442cb'

2013-04-20 14:19:08 +02:00

hpeldsp_init_armv6.c

Merge commit '7384b7a71338d960e421d6dc3d77da09b0a442cb'

2013-04-20 14:19:08 +02:00

hpeldsp_init_neon.c

Merge commit '7384b7a71338d960e421d6dc3d77da09b0a442cb'

2013-04-20 14:19:08 +02:00

hpeldsp_neon.S

arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

2013-04-19 23:19:08 +03:00

int_neon.S

Merge remote-tracking branch 'qatar/master'

2013-12-21 01:19:59 +01:00

jrevdct_arm.S

…

Makefile

vc1: arm: Add NEON assembly

2013-12-20 14:53:39 +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

arm: Mangle external symbols properly in new vfp assembly files

2013-07-22 14:48:30 +03:00

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

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

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

mpegvideo_arm.h

…

mpegvideo_armv5te_s.S

…

mpegvideo_armv5te.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

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

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

Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'

2013-05-01 18:21:35 +02:00

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

Merge commit '2ad4ee345a4216aef3999f57dd14c56128d27a13'

2014-01-04 13:13:39 +01:00

simple_idct_armv5te.S

…

simple_idct_armv6.S

…

simple_idct_neon.S

…

synth_filter_neon.S

…

synth_filter_vfp.S

arm: Mangle external symbols properly in new vfp assembly files

2013-07-22 14:48:30 +03:00

vc1dsp_init_arm.c

Merge commit '832e19063209a5f355af733d1a45f5051f49ce33'

2013-12-20 23:12:16 +01:00

vc1dsp_init_neon.c

Merge commit 'b254490bdabb21bd517c05b1a68717f9952ac8c4'

2013-12-20 23:33:15 +01:00

vc1dsp_neon.S

Merge commit '832e19063209a5f355af733d1a45f5051f49ce33'

2013-12-20 23:12:16 +01:00

vc1dsp.h

Merge commit '832e19063209a5f355af733d1a45f5051f49ce33'

2013-12-20 23:12:16 +01:00

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

vp3: Use full transpose for all IDCTs

2013-04-15 12:32:05 +03:00

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

…