diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 02:16:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 02:16:29 +0100 |
| commit | e86f754b1c5f1e0d2e04e2f2c20885706ae50366 (patch) | |
| tree | d29859b1628bb64984128a3320c8aab0052f2bef /libavcodec/arm/Makefile | |
| parent | 39b40be2a1303013783df7cc184ffe1860ff31ce (diff) | |
| parent | 702458538d4e52809bcef460d39baabf061b16b5 (diff) | |
| download | ffmpeg-e86f754b1c5f1e0d2e04e2f2c20885706ae50366.tar.gz | |
Merge commit '702458538d4e52809bcef460d39baabf061b16b5'
* commit '702458538d4e52809bcef460d39baabf061b16b5':
g722: Add ARM NEON implementation for g722_apply_qmf()
Conflicts:
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/Makefile')
| -rw-r--r-- | libavcodec/arm/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index 1e08569066..240ee3f563 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -32,6 +32,8 @@ OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_init_arm.o # decoders/encoders OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_init_arm.o \ arm/sbrdsp_init_arm.o +OBJS-$(CONFIG_ADPCM_G722_DECODER) += arm/g722dsp_init_arm.o +OBJS-$(CONFIG_ADPCM_G722_ENCODER) += arm/g722dsp_init_arm.o OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o OBJS-$(CONFIG_FLAC_DECODER) += arm/flacdsp_init_arm.o \ arm/flacdsp_arm.o @@ -129,6 +131,8 @@ NEON-OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_neon.o # decoders/encoders NEON-OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_neon.o \ arm/sbrdsp_neon.o +NEON-OBJS-$(CONFIG_ADPCM_G722_DECODER) += arm/g722dsp_neon.o +NEON-OBJS-$(CONFIG_ADPCM_G722_ENCODER) += arm/g722dsp_neon.o NEON-OBJS-$(CONFIG_LLAUDDSP) += arm/lossless_audiodsp_neon.o NEON-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_neon.o \ arm/synth_filter_neon.o |