1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/libavcodec/arm
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
aacpsdsp_init_arm.c
aacpsdsp_neon.S
ac3dsp_arm.S
ac3dsp_armv6.S
ac3dsp_init_arm.c
ac3dsp_neon.S
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
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
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
fft_neon.S
fft_vfp.S
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
fmtconvert_neon.S Merge commit '5bcbb516f2ff45290ef7995b081762e668693672' 2014-02-08 00:48:26 +01:00
fmtconvert_vfp_armv6.S
fmtconvert_vfp.S
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 '5bcbb516f2ff45290ef7995b081762e668693672' 2014-02-08 00:48:26 +01:00
h264pred_init_arm.c
h264pred_neon.S
h264qpel_init_arm.c
h264qpel_neon.S
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
hpeldsp_init_neon.c
hpeldsp_neon.S
int_neon.S avcodec/arm/int_neon: fix handling sizes % 16 != 0 2014-02-13 02:20:08 +01:00
jrevdct_arm.S
Makefile Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18' 2014-03-20 22:26:31 +01:00
mathops.h
mdct_fixed_neon.S
mdct_neon.S Merge commit '5bcbb516f2ff45290ef7995b081762e668693672' 2014-02-08 00:48:26 +01:00
mdct_vfp.S
mpegaudiodsp_fixed_armv6.S
mpegaudiodsp_init_arm.c
mpegvideo_arm.c
mpegvideo_arm.h Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49' 2014-01-14 14:38:10 +01:00
mpegvideo_armv5te_s.S
mpegvideo_armv5te.c
mpegvideo_neon.S Merge commit '5bcbb516f2ff45290ef7995b081762e668693672' 2014-02-08 00:48:26 +01:00
neon.S
neontest.c Merge remote-tracking branch 'qatar/master' 2014-01-11 03:08:10 +01:00
rdft_neon.S
rv34dsp_init_arm.c
rv34dsp_neon.S
rv40dsp_init_arm.c
rv40dsp_neon.S
sbrdsp_init_arm.c
sbrdsp_neon.S
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
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 Merge commit '831a1180785a786272cdcefb71566a770bfb879e' 2014-03-13 23:59:56 +01:00
videodsp_init_arm.c
videodsp_init_armv5te.c
vorbisdsp_init_arm.c
vorbisdsp_neon.S
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
vp6dsp_neon.S
vp8_armv6.S
vp8.h
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