Michael Niedermayer 77bc342975 Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81' ...

* commit '322a1dda973e802db7b57f2007fad3efcd5bab81':
  dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros

Conflicts:
	libavcodec/arm/hpeldsp_init_arm.c
	libavcodec/x86/dsputil_x86.h

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

2014-03-22 22:53:33 +01:00

..

aac.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

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

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

…

cabac.h

avcodec/arm/cabac: fix inline cabac reader with the UNCHECKED bitstream reader

2014-03-15 01:08:45 +01:00

dca.h

Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'

2014-02-28 21:41:19 +01:00

dcadsp_init_arm.c

Merge commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b'

2014-02-28 21:52:25 +01:00

dcadsp_neon.S

Merge commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b'

2014-02-28 21:52:25 +01:00

dcadsp_vfp.S

Merge commit '87ec849fe9acba075c843e67bcd01f256f481a18'

2014-02-28 18:14:12 +01:00

dsputil_arm.h

Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'

2014-03-20 22:06:01 +01:00

dsputil_arm.S

Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'

2014-01-08 05:36:56 +01: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

Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'

2014-03-20 22:06:01 +01:00

dsputil_init_armv5te.c

Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'

2014-03-20 22:06:01 +01:00

dsputil_init_armv6.c

Merge commit '82bb3048013201c0095d2853d4623633d912252f'

2014-03-20 22:36:40 +01:00

dsputil_init_neon.c

Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'

2014-03-20 22:06:01 +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

avcodec/arm/fft_fixed_neon: reduce diff by 2 spaces to libav

2014-03-14 14:28:28 +01: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

lavc: fix flac encoder and decoder dependencies

2014-02-13 21:00:32 +01:00

fmtconvert_init_arm.c

Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc'

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

fmtconvert_neon.S

Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'

2014-02-08 00:48:26 +01:00

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

Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'

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

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

Merge remote-tracking branch 'qatar/master'

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

h264idct_neon.S

Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'

2014-02-08 00:48:26 +01: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

Merge remote-tracking branch 'qatar/master'

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

hpeldsp_arm.h

Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'

2014-01-14 14:38:10 +01:00

hpeldsp_arm.S

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

2014-03-13 23:59:56 +01:00

hpeldsp_armv6.S

Merge commit '61985ad72c47bbb668f2d3923bf5c9df83e79323'

2014-03-09 01:16:21 +01:00

hpeldsp_init_arm.c

Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'

2014-03-22 22:53:33 +01: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

avcodec/arm/int_neon: fix handling sizes % 16 != 0

2014-02-13 02:20:08 +01:00

jrevdct_arm.S

Drop DCTELEM typedef

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

Makefile

Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'

2014-03-20 22:26:31 +01:00

mathops.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

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

mdct_fixed_neon.S

Reinstate proper FFmpeg license for all files.

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

mdct_neon.S

Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'

2014-02-08 00:48:26 +01:00

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

Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'

2014-01-14 14:38:10 +01:00

mpegvideo_armv5te_s.S

…

mpegvideo_armv5te.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

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

mpegvideo_neon.S

Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'

2014-02-08 00:48:26 +01:00

neon.S

Reinstate proper FFmpeg license for all files.

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

neontest.c

Merge remote-tracking branch 'qatar/master'

2014-01-11 03:08:10 +01:00

rdft_neon.S

…

rv34dsp_init_arm.c

Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'

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

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

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

…

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: Fix project name

2012-12-22 00:58:08 +01:00

videodsp_armv5te.S

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

2014-03-13 23:59:56 +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

Merge commit '4506a854a4d846692ba71daeeff661dc214c8fa2'

2014-03-09 13:06:31 +01:00

vp3dsp_neon.S

Merge remote-tracking branch 'qatar/master'

2014-01-08 05:44:56 +01:00

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

Merge remote-tracking branch 'qatar/master'

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

vp8dsp_armv6.S

Merge commit '5a7f382a5d33d9a26890affe6c8c5070a48dfc22'

2014-03-12 22:03:00 +01:00

vp8dsp_init_arm.c

avcodec/vp8dsp: add VP7 idct and loop filter

2014-02-15 02:15:35 +01:00

vp8dsp_init_armv6.c

avcodec/vp8dsp: add VP7 idct and loop filter

2014-02-15 02:15:35 +01:00

vp8dsp_init_neon.c

avcodec/vp8dsp: add VP7 idct and loop filter

2014-02-15 02:15:35 +01:00

vp8dsp_neon.S

Merge remote-tracking branch 'qatar/master'

2014-02-06 15:33:54 +01:00

vp8dsp.h

avcodec/vp8dsp: add VP7 idct and loop filter

2014-02-15 02:15:35 +01:00

vp56_arith.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

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