A new hidden config variable is added for the codecs that depend on
the acelp parts.
---
configure | 7 ++++---
libavcodec/Makefile | 15 ++++++---------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index 6bbe6e2..931c300 100755
--- a/configure
+++ b/configure
@@ -1213,6 +1213,7 @@ HAVE_LIST="
CONFIG_EXTRA="
aandcttables
ac3dsp
+ acelp
avutil
celp
error_resilience
@@ -1348,8 +1349,8 @@ ac3_decoder_select="mdct ac3dsp ac3_parser"
ac3_encoder_select="mdct ac3dsp"
ac3_fixed_encoder_select="mdct ac3dsp"
alac_encoder_select="lpc"
-amrnb_decoder_select="celp lsp"
-amrwb_decoder_select="celp lsp"
+amrnb_decoder_select="acelp celp lsp"
+amrwb_decoder_select="acelp celp lsp"
atrac1_decoder_select="mdct sinewin"
atrac3_decoder_select="mdct"
binkaudio_dct_decoder_select="mdct rdft dct sinewin"
@@ -1447,7 +1448,7 @@ rv20_encoder_select="h263_encoder"
rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel
mpegvideo"
rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel
mpegvideo"
shorten_decoder_select="golomb"
-sipr_decoder_select="celp lsp"
+sipr_decoder_select="acelp celp lsp"
snow_decoder_select="dwt rangecoder"
snow_encoder_select="aandcttables dwt error_resilience mpegvideoenc rangecoder"
svq1_decoder_select="error_resilience mpegvideo"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0de644c..2988b53 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -33,6 +33,9 @@ OBJS = allcodecs.o
\
# parts needed for many different codecs
OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o
OBJS-$(CONFIG_AC3DSP) += ac3dsp.o
+OBJS-$(CONFIG_ACELP) += acelp_filters.o \
+ acelp_pitch_delay.o \
+ acelp_vectors.o
OBJS-$(CONFIG_CELP) += celp_filters.o celp_math.o
OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o
OBJS-$(CONFIG_DWT) += dwt.o
@@ -83,12 +86,8 @@ OBJS-$(CONFIG_AC3_FIXED_ENCODER) += ac3enc_fixed.o
ac3enc.o ac3tab.o ac3.o
OBJS-$(CONFIG_ALAC_DECODER) += alac.o
OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o
OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mpeg4audio.o
-OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o acelp_filters.o \
- acelp_vectors.o \
- acelp_pitch_delay.o
-OBJS-$(CONFIG_AMRWB_DECODER) += amrwbdec.o acelp_filters.o \
- acelp_vectors.o \
- acelp_pitch_delay.o
+OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o
+OBJS-$(CONFIG_AMRWB_DECODER) += amrwbdec.o
OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o
OBJS-$(CONFIG_ANM_DECODER) += anm.o
OBJS-$(CONFIG_ANSI_DECODER) += ansi.o cga_data.o
@@ -334,9 +333,7 @@ OBJS-$(CONFIG_S302M_DECODER) += s302m.o
OBJS-$(CONFIG_SGI_DECODER) += sgidec.o
OBJS-$(CONFIG_SGI_ENCODER) += sgienc.o rle.o
OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o
-OBJS-$(CONFIG_SIPR_DECODER) += sipr.o acelp_pitch_delay.o \
- acelp_vectors.o acelp_filters.o \
- sipr16k.o
+OBJS-$(CONFIG_SIPR_DECODER) += sipr.o sipr16k.o
OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o
OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o
OBJS-$(CONFIG_SMC_DECODER) += smc.o
--
1.7.1
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
