diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 21:42:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 21:42:14 +0200 |
| commit | 948a15195c69da2ff9a4b0ac7df782ba1cc2795f (patch) | |
| tree | 9a461846aa7ce2427422a684bce93ea34c5db653 /libavcodec/arm | |
| parent | fd280de7eeb8657c406e89dd4c84b5ffab9c0508 (diff) | |
| parent | b075869bc1e1aadea0a8dc819ebfb758adb9e3d0 (diff) | |
| download | ffmpeg-streaming-948a15195c69da2ff9a4b0ac7df782ba1cc2795f.zip ffmpeg-streaming-948a15195c69da2ff9a4b0ac7df782ba1cc2795f.tar.gz | |
Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'
* commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0':
configure: Factor out flacdsp module
Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index 2f87396..ede59a1 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -18,6 +18,8 @@ OBJS-$(CONFIG_IDCTDSP) += arm/idctdsp_init_arm.o \ arm/idctdsp_arm.o \ arm/jrevdct_arm.o \ arm/simple_idct_arm.o +OBJS-$(CONFIG_FLACDSP) += arm/flacdsp_init_arm.o \ + arm/flacdsp_arm.o OBJS-$(CONFIG_LLAUDDSP) += arm/lossless_audiodsp_init_arm.o OBJS-$(CONFIG_ME_CMP) += arm/me_cmp_init_arm.o OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_init_arm.o @@ -34,9 +36,6 @@ OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_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 -OBJS-$(CONFIG_FLAC_ENCODER) += arm/flacdsp_init_arm.o OBJS-$(CONFIG_HEVC_DECODER) += arm/hevcdsp_init_arm.o OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_init_arm.o OBJS-$(CONFIG_VC1_DECODER) += arm/vc1dsp_init_arm.o |
