diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 21:22:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 21:23:09 +0100 |
| commit | 50b68e323c41207a3a69532c89a7675154986c3b (patch) | |
| tree | d6508b51e7dd7a35a008615c3d1c52a9d7c953d5 /libavcodec/arm/Makefile | |
| parent | fc64e128f00893d90014b1c97e6846a14ec53dad (diff) | |
| parent | 3b5946bccef6cd219f01d22e542ca5c6de68a7be (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
truehd: add hand-scheduled ARM asm version of ff_mlp_pack_output.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/Makefile')
| -rw-r--r-- | libavcodec/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index a9c9aae51b..70aeecfff5 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -52,6 +52,7 @@ ARMV6-OBJS-$(CONFIG_DSPUTIL) += arm/dsputil_init_armv6.o \ ARMV6-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_armv6.o ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \ arm/hpeldsp_armv6.o +ARMV6-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv6.o ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_fixed_armv6.o ARMV6-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8_armv6.o \ |