Merge commit '15a29c39'

* commit '15a29c39':
  truehd: add hand-scheduled ARM asm version of mlp_filter_channel.

Conflicts:
	libavcodec/arm/Makefile
	libavcodec/arm/mlpdsp_init_arm.c

See: 87b128d5Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/arm/Makefile

@@ -16,8 +16,7 @@ OBJS-$(CONFIG_H264PRED)                += arm/h264pred_init_arm.o
 OBJS-$(CONFIG_H264QPEL)                += arm/h264qpel_init_arm.o
 OBJS-$(CONFIG_HPELDSP)                 += arm/hpeldsp_init_arm.o        \
                                           arm/hpeldsp_arm.o
-OBJS-$(CONFIG_MLP_DECODER)             += arm/mlpdsp_init_arm.o         \
-                                          arm/mlpdsp_arm.o
+OBJS-$(CONFIG_MLP_DECODER)             += arm/mlpdsp_init_arm.o
 OBJS-$(CONFIG_MPEGAUDIODSP)            += arm/mpegaudiodsp_init_arm.o
 OBJS-$(CONFIG_MPEGVIDEO)               += arm/mpegvideo_arm.o
 OBJS-$(CONFIG_NEON_CLOBBER_TEST)       += arm/neontest.o
@@ -40,6 +39,7 @@ OBJS-$(CONFIG_RV40_DECODER)            += arm/rv34dsp_init_arm.o        \
 
 ARMV5TE-OBJS-$(CONFIG_DSPUTIL)         += arm/dsputil_init_armv5te.o    \
                                           arm/simple_idct_armv5te.o
+ARMV5TE-OBJS-$(CONFIG_MLP_DECODER)     += arm/mlpdsp_armv5te.o
 ARMV5TE-OBJS-$(CONFIG_MPEGVIDEO)       += arm/mpegvideo_armv5te.o       \
                                           arm/mpegvideo_armv5te_s.o
 ARMV5TE-OBJS-$(CONFIG_VIDEODSP)        += arm/videodsp_init_armv5te.o   \

libavcodec/arm/mlpdsp_arm.S → libavcodec/arm/mlpdsp_armv5te.S

@@ -63,7 +63,7 @@ PSAMP   .req    lr
 .endm
 
 .macro loadd_ group, index0, index1, base, offset
-A .if offset >= 256
+A .if \offset >= 256
 A       ldr     \group\index0, [\base, #\offset]
 A       ldr     \group\index1, [\base, #(\offset) + 4]
 A .else

libavcodec/arm/mlpdsp_init_arm.c

@@ -32,5 +32,9 @@ void ff_mlp_filter_channel_arm(int32_t *state, const int32_t *coeff,
 
 av_cold void ff_mlpdsp_init_arm(MLPDSPContext *c)
 {
-    c->mlp_filter_channel = ff_mlp_filter_channel_arm;
+    int cpu_flags = av_get_cpu_flags();
+
+    if (have_armv5te(cpu_flags)) {
+        c->mlp_filter_channel = ff_mlp_filter_channel_arm;
+    }
 }