eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-28 08:51:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
b96163f055ee44484ca4a06382221c2abb1e0914
ffmpeg/libavcodec/arm
History
Bernd Kuhls 0cda7baa8b Fix compile error on arm4/arm5 platform 
Since these commits
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8

compilation on arm4/arm5 fails:

libavcodec/libavcodec.so: undefined reference to
`ff_startcode_find_candidate_armv6'

Because libavcodec/arm/Makefile contains
ARMV6-OBJS-$(CONFIG_STARTCODE)         += arm/startcode_armv6.o
function ff_startcode_find_candidate_armv6 is not included for older ARM
archs. The bug was found during automatic buildroot builds:

http://autobuild.buildroot.net/results/ec7/ec71e4f16ee9106747dff5f15999cbd17903e76f//build-end.log
Quote from configure summary:
ARCH                      arm (armv4t)
big-endian                no
runtime cpu detection     yes
ARMv5TE enabled           no
ARMv6 enabled             no
ARMv6T2 enabled           no

http://autobuild.buildroot.net/results/be7/be72eb182eaccf0064a32c9dfc2ac1c0d6555506/build-end.log
ARCH                      arm (armv5te)
big-endian                no
runtime cpu detection     yes
ARMv5TE enabled           yes
ARMv6 enabled             no
ARMv6T2 enabled           no

This patch provides the necessary #if clauses as discussed with Michael:
https://ffmpeg.org/pipermail/ffmpeg-devel/2014-September/163329.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6b733be755)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04 23:52:28 +02: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
Merge commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1'
2014-04-30 00:23:01 +02:00
audiodsp_arm.h
Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'
2014-06-22 17:58:28 +02:00
audiodsp_init_arm.c
Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'
2014-06-22 17:58:28 +02:00
audiodsp_init_neon.c
Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'
2014-06-22 17:58:28 +02:00
audiodsp_neon.S
Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'
2014-06-22 17:58:28 +02:00
blockdsp_arm.h
Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'
2014-06-19 04:54:38 +02:00
blockdsp_init_arm.c
Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'
2014-06-19 04:54:38 +02:00
blockdsp_init_neon.c
Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'
2014-06-19 04:54:38 +02:00
blockdsp_neon.S
Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'
2014-06-19 04:54:38 +02:00
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
dct-test.c
Merge commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce'
2014-07-21 13:33:51 +02: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 '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
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
…
h264cmc_neon.S
Merge commit 'f23d26a6864128001b03876b0b92fffe131f2060'
2014-06-23 20:35:33 +02:00
h264dsp_init_arm.c
Fix compile error on arm4/arm5 platform
2014-10-04 23:52:28 +02:00
h264dsp_neon.S
…
h264idct_neon.S
Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'
2014-02-08 00:48:26 +01:00
h264pred_init_arm.c
Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'
2014-04-04 14:46:10 +02:00
h264pred_neon.S
…
h264qpel_init_arm.c
Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'
2014-07-25 13:05:08 +02:00
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
…
idct.h
Merge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'
2014-07-21 01:56:22 +02:00
idctdsp_arm.h
Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'
2014-07-01 15:22:11 +02:00
idctdsp_arm.S
Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'
2014-07-01 15:22:11 +02:00
idctdsp_armv6.S
Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'
2014-07-01 15:22:11 +02:00
idctdsp_init_arm.c
Merge commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b'
2014-09-03 03:19:40 +02:00
idctdsp_init_armv5te.c
Merge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'
2014-07-21 01:56:22 +02:00
idctdsp_init_armv6.c
avcodec/arm/idctdsp_init_arm*: Only select non bitexact IDCTs by default when bitexact is not set
2014-07-27 14:21:36 +02:00
idctdsp_init_neon.c
Merge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'
2014-07-21 01:56:22 +02:00
idctdsp_neon.S
Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'
2014-07-01 15:22:11 +02:00
int_neon.S
Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'
2014-05-30 00:59:15 +02:00
jrevdct_arm.S
…
lossless_audiodsp_init_arm.c
apedsp: move to llauddsp
2014-06-05 20:31:59 +02:00
lossless_audiodsp_neon.S
apedsp: move to llauddsp
2014-06-05 20:31:59 +02:00
Makefile
Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'
2014-08-15 20:25:12 +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
Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'
2014-02-08 00:48:26 +01:00
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 '2d60444331fca1910510038dd3817bea885c2367'
2014-07-17 23:27:40 +02:00
mlpdsp_armv5te.S
Merge commit '7e18a727d2c2a19f22fcf68875d1b05fd2eafcef'
2014-07-18 13:17:29 +02:00
mlpdsp_armv6.S
Merge remote-tracking branch 'qatar/master'
2014-03-26 21:23:09 +01:00
mlpdsp_init_arm.c
Merge remote-tracking branch 'qatar/master'
2014-03-26 21:23:09 +01: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 '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
Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'
2014-02-08 00:48:26 +01:00
mpegvideoencdsp_armv6.S
Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'
2014-07-07 15:36:58 +02:00
mpegvideoencdsp_init_arm.c
Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'
2014-07-07 15:36:58 +02: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
pixblockdsp_armv6.S
Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'
2014-07-10 01:22:14 +02:00
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
Reinstate proper FFmpeg license for all files.
2013-08-30 15:47:38 +00:00
rv40dsp_init_arm.c
Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'
2014-07-25 13:05:08 +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
…
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-10-04 23:52:28 +02:00
vc1dsp_init_neon.c
Merge commit '896a5bff64264f4d01ed98eacc97a67260c1e17e'
2014-06-03 18:19:21 +02:00
vc1dsp_neon.S
Merge commit '896a5bff64264f4d01ed98eacc97a67260c1e17e'
2014-06-03 18:19:21 +02: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 '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'
2014-04-05 18:54:15 +02: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
arm: asm decode_block_coeffs_internal is vp8 specific
2014-04-04 10:39:29 +02:00
vp8dsp_armv6.S
Merge commit '5a7f382a5d33d9a26890affe6c8c5070a48dfc22'
2014-03-12 22:03:00 +01:00
vp8dsp_init_arm.c
Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'
2014-04-04 14:46:10 +02:00
vp8dsp_init_armv6.c
Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'
2014-04-04 14:46:10 +02:00
vp8dsp_init_neon.c
Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'
2014-04-04 14:46:10 +02:00
vp8dsp_neon.S
Merge remote-tracking branch 'qatar/master'
2014-02-06 15:33:54 +01:00
vp8dsp.h
Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'
2014-04-04 14:46:10 +02:00
vp56_arith.h
…