[FFmpeg-cvslog] configure: Factor out flacdsp module
Vittorio Giovara
git at videolan.org
Fri Jul 17 21:51:05 CEST 2015
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Thu Jul 16 16:10:57 2015 +0100| [b075869bc1e1aadea0a8dc819ebfb758adb9e3d0] | committer: Vittorio Giovara
configure: Factor out flacdsp module
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b075869bc1e1aadea0a8dc819ebfb758adb9e3d0
---
configure | 5 +++--
libavcodec/Makefile | 5 +++--
libavcodec/arm/Makefile | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 0dac109..467bf99 100755
--- a/configure
+++ b/configure
@@ -1588,6 +1588,7 @@ CONFIG_EXTRA="
faandct
faanidct
fdctdsp
+ flacdsp
fmtconvert
gcrypt
gmp
@@ -1841,8 +1842,8 @@ ffv1_encoder_select="rangecoder"
ffvhuff_decoder_select="huffyuv_decoder"
ffvhuff_encoder_select="huffyuv_encoder"
fic_decoder_select="golomb"
-flac_decoder_select="golomb"
-flac_encoder_select="bswapdsp golomb lpc"
+flac_decoder_select="flacdsp golomb"
+flac_encoder_select="bswapdsp flacdsp golomb lpc"
flashsv_decoder_deps="zlib"
flashsv_encoder_deps="zlib"
flashsv2_decoder_deps="zlib"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 008207b..61fd3a2 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -47,6 +47,7 @@ OBJS-$(CONFIG_FDCTDSP) += fdctdsp.o jfdctfst.o jfdctint.o
FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o cos_fixed_tables.o
OBJS-$(CONFIG_FFT) += avfft.o fft_fixed.o fft_float.o \
$(FFT-OBJS-yes)
+OBJS-$(CONFIG_FLACDSP) += flacdsp.o
OBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o
OBJS-$(CONFIG_GOLOMB) += golomb.o
OBJS-$(CONFIG_H263DSP) += h263dsp.o
@@ -205,8 +206,8 @@ OBJS-$(CONFIG_EXR_DECODER) += exr.o
OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1.o
OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1.o
OBJS-$(CONFIG_FIC_DECODER) += fic.o
-OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o flacdsp.o
-OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o flacdsp.o
+OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o
+OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o
OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o
OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o
OBJS-$(CONFIG_FLASHSV2_DECODER) += flashsv.o
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index 57f5bc4..e9eea1a 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_ME_CMP) += arm/me_cmp_init_arm.o
OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_init_arm.o
OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_arm.o
@@ -32,8 +34,6 @@ 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_FLAC_DECODER) += arm/flacdsp_init_arm.o \
- arm/flacdsp_arm.o
OBJS-$(CONFIG_ADPCM_G722_DECODER) += arm/g722dsp_init_arm.o
OBJS-$(CONFIG_ADPCM_G722_ENCODER) += arm/g722dsp_init_arm.o
OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_init_arm.o
More information about the ffmpeg-cvslog
mailing list