package/ffmpeg: Fix compile error on arm4/arm5
PATCH 1/1 package/ffmpeg: Fix compile error on arm4/arm5
Fixes
http://autobuild.buildroot.net/results/d7e/d7ea8db79210228103257b6a28fada38cca142cb/
http://autobuild.buildroot.net/results/ec7/ec71e4f16ee9106747dff5f15999cbd17903e76f/
http://autobuild.buildroot.net/results/be7/be72eb182eaccf0064a32c9dfc2ac1c0d6555506/
http://autobuild.buildroot.net/results/b35/b35b71e3d21394e7ca24f3b112d8a4047cd6c87b/
http://autobuild.buildroot.net/results/5bb/5bbc8b5cdcd99229a6813970293f98b044fc489d/
http://autobuild.buildroot.net/results/be5/be54e75c4171d1db0eaaaeb5f5df29751d7db57b/
--- package/ffmpeg/ffmpeg-0002-arm4-arm5.patch | 87 ++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 package/ffmpeg/ffmpeg-0002-arm4-arm5.patch
package/ffmpeg/ffmpeg-0002-arm4-arm5.patch new file +87 -0
@@ -0,0 +1,87 @@ +Fix compile error on arm4/arm5 platform + +Patch submitted upstream: +https://ffmpeg.org/pipermail/ffmpeg-devel/2014-September/163335.html + +Signed-off-by: Bernd Kuhls <[email protected]> + + + +From fe0f39e7263cd95783ad4669f8c3672a8eab4c83 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <[email protected]> +Date: Tue, 23 Sep 2014 20:06:26 +0200 +Subject: [PATCH 1/1] 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 <[email protected]> +--- + libavcodec/arm/h264dsp_init_arm.c | 2 ++ + libavcodec/arm/vc1dsp_init_arm.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c +index f7aee1f..88dfd75 100644 +--- a/libavcodec/arm/h264dsp_init_arm.c ++++ b/libavcodec/arm/h264dsp_init_arm.c +@@ -107,8 +107,10 @@ av_cold void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, + { + int cpu_flags = av_get_cpu_flags(); + ++#if HAVE_ARMV6 + if (have_setend(cpu_flags)) + c->startcode_find_candidate = ff_startcode_find_candidate_armv6; ++#endif + if (have_neon(cpu_flags)) + h264dsp_init_neon(c, bit_depth, chroma_format_idc); + } +diff --git a/libavcodec/arm/vc1dsp_init_arm.c b/libavcodec/arm/vc1dsp_init_arm.c +index 9dae22c..5f2c759 100644 +--- a/libavcodec/arm/vc1dsp_init_arm.c ++++ b/libavcodec/arm/vc1dsp_init_arm.c +@@ -28,8 +28,10 @@ av_cold void ff_vc1dsp_init_arm(VC1DSPContext *dsp) + { + int cpu_flags = av_get_cpu_flags(); + ++#if HAVE_ARMV6 + if (have_setend(cpu_flags)) + dsp->startcode_find_candidate = ff_startcode_find_candidate_armv6; ++#endif + if (have_neon(cpu_flags)) + ff_vc1dsp_init_neon(dsp); + } +-- +1.7.10.4 +
Signature · 1 line
1.7.10.4
PATCH 1/1 package/ffmpeg: Fix compile error on arm4/arm5
Bernd Kuhls <[email protected]> wrote in news:1411496109-508-1-git-send-email-bernd.kuhls at t-online.de:
Quoted 1 line
package/ffmpeg/ffmpeg-0002-arm4-arm5.patch | 87
++++++++++++++++++++++++++++
Hi,
this patch also fixes this tvheadend build error:
http://autobuild.buildroot.net/results/910/910fb83484f49923af6efec43955695e30
0bcb61//
Regards, Bernd
PATCH 1/1 package/ffmpeg: Fix compile error on arm4/arm5
In reply to Bernd KuhlsBernd Kuhls <[email protected]> wrote in news:1411496109-508-1-git-send-email-bernd.kuhls at t-online.de:
package/ffmpeg/ffmpeg-0002-arm4-arm5.patch line 4
Quoted 2 lines
package/ffmpeg/ffmpeg-0002-arm4-arm5.patch new file +2
-0+Patch submitted upstream: +https://ffmpeg.org/pipermail/ffmpeg-devel/2014-September/163335.html
Hi,
patch was accepted upstream:
http://git.videolan.org/?p=ffmpeg.git;a=commit;h=6b733be755529f2472472d9ed1b2eef3b6398828
Regards, Bernd
Thomas Petazzoni
AppliedPATCH 1/1 package/ffmpeg: Fix compile error on arm4/arm5
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 8 lines · Bernd Kuhls
Fixes
http://autobuild.buildroot.net/results/d7e/d7ea8db79210228103257b6a28fada38cca142cb/
http://autobuild.buildroot.net/results/ec7/ec71e4f16ee9106747dff5f15999cbd17903e76f/
http://autobuild.buildroot.net/results/be7/be72eb182eaccf0064a32c9dfc2ac1c0d6555506/
http://autobuild.buildroot.net/results/b35/b35b71e3d21394e7ca24f3b112d8a4047cd6c87b/
http://autobuild.buildroot.net/results/5bb/5bbc8b5cdcd99229a6813970293f98b044fc489d/
http://autobuild.buildroot.net/results/be5/be54e75c4171d1db0eaaaeb5f5df29751d7db57b/
Quoted 5 lines
Signed-off-by Bernd Kuhls <[email protected]>--- package/ffmpeg/ffmpeg-0002-arm4-arm5.patch | 87 ++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 package/ffmpeg/ffmpeg-0002-arm4-arm5.patch
Thanks, applied. I've updated the patch description to indicate that it has been merged upstream, and in which commit.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com