arm: Always build the hevcdsp_init_arm.c file

Message ID 20170328080945.34848-1-martin@martin.st
State Committed
Commit fbc6f190a61810a4f3c5181822c2da1027cda154
Headers show

Commit Message

Martin Storsjö March 28, 2017, 8:09 a.m.
The main hevcdsp.c file calls this init function if HAVE_ARM is set,
regardless of whether neon support is available or not.

This fixes builds where neon isn't supported by the build tools at all.
---
 libavcodec/arm/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Diego Biurrun March 28, 2017, 8:29 a.m. | #1
On Tue, Mar 28, 2017 at 11:09:45AM +0300, Martin Storsjö wrote:
> The main hevcdsp.c file calls this init function if HAVE_ARM is set,
> regardless of whether neon support is available or not.
> 
> This fixes builds where neon isn't supported by the build tools at all.
> ---
>  libavcodec/arm/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

OK

Diego

Patch

diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index 555de160e4..b48745ad40 100644
--- a/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@ -41,6 +41,7 @@  OBJS-$(CONFIG_AAC_DECODER)             += arm/aacpsdsp_init_arm.o       \
                                           arm/sbrdsp_init_arm.o
 OBJS-$(CONFIG_APE_DECODER)             += arm/apedsp_init_arm.o
 OBJS-$(CONFIG_DCA_DECODER)             += arm/dcadsp_init_arm.o
+OBJS-$(CONFIG_HEVC_DECODER)            += arm/hevcdsp_init_arm.o
 OBJS-$(CONFIG_MLP_DECODER)             += arm/mlpdsp_init_arm.o
 OBJS-$(CONFIG_RV40_DECODER)            += arm/rv40dsp_init_arm.o
 OBJS-$(CONFIG_VORBIS_DECODER)          += arm/vorbisdsp_init_arm.o
@@ -134,8 +135,7 @@  NEON-OBJS-$(CONFIG_AAC_DECODER)        += arm/aacpsdsp_neon.o           \
 NEON-OBJS-$(CONFIG_APE_DECODER)        += arm/apedsp_neon.o
 NEON-OBJS-$(CONFIG_DCA_DECODER)        += arm/dcadsp_neon.o             \
                                           arm/synth_filter_neon.o
-NEON-OBJS-$(CONFIG_HEVC_DECODER)       += arm/hevc_idct.o               \
-                                          arm/hevcdsp_init_arm.o
+NEON-OBJS-$(CONFIG_HEVC_DECODER)       += arm/hevc_idct.o
 NEON-OBJS-$(CONFIG_RV30_DECODER)       += arm/rv34dsp_neon.o
 NEON-OBJS-$(CONFIG_RV40_DECODER)       += arm/rv34dsp_neon.o            \
                                           arm/rv40dsp_neon.o