---
This might compile a couple of unnecessary files, but they are relatively
small and it will simplify more entries in this way.
Vittorio
configure | 13 ++++++++-----
libavcodec/Makefile | 32 ++++++++++----------------------
2 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/configure b/configure
index 8518e69..bedf523 100755
--- a/configure
+++ b/configure
@@ -1646,6 +1646,7 @@ CONFIG_EXTRA="
blockdsp
bswapdsp
cabac
+ celp_math
dirac_parse
dvprofile
faandct
@@ -1881,8 +1882,8 @@ adpcm_g722_encoder_select="g722dsp"
aic_decoder_select="golomb idctdsp"
alac_encoder_select="lpc"
als_decoder_select="bswapdsp"
-amrnb_decoder_select="lsp"
-amrwb_decoder_select="lsp"
+amrnb_decoder_select="celp_math lsp"
+amrwb_decoder_select="celp_math lsp"
amv_decoder_select="sp5x_decoder"
ape_decoder_select="bswapdsp"
asv1_decoder_select="blockdsp bswapdsp idctdsp"
@@ -1931,6 +1932,8 @@ fourxm_decoder_select="blockdsp bswapdsp"
fraps_decoder_select="bswapdsp huffman"
g2m_decoder_deps="zlib"
g2m_decoder_select="blockdsp idctdsp jpegtables"
+g723_1_decoder_select="celp_math"
+g723_1_encoder_select="celp_math"
h261_decoder_select="mpeg_er mpegvideo"
h261_encoder_select="aandcttables mpegvideoenc"
h263_decoder_select="error_resilience h263_parser h263dsp mpeg_er mpegvideo
qpeldsp"
@@ -2021,7 +2024,7 @@ png_encoder_deps="zlib"
png_encoder_select="huffyuvencdsp"
prores_decoder_select="idctdsp"
prores_encoder_select="fdctdsp"
-qcelp_decoder_select="lsp"
+qcelp_decoder_select="celp_math lsp"
qdm2_decoder_select="mdct rdft mpegaudiodsp"
ra_144_encoder_select="audio_frame_queue lpc"
ralf_decoder_select="golomb"
@@ -2034,7 +2037,7 @@ rv30_decoder_select="error_resilience golomb h264chroma
h264pred h264qpel mpeg_e
rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel
mpeg_er mpegvideo rv34dsp videodsp"
screenpresso_decoder_deps="zlib"
shorten_decoder_select="golomb"
-sipr_decoder_select="lsp"
+sipr_decoder_select="lsp celp_math"
sp5x_decoder_select="mjpeg_decoder"
svq1_decoder_select="hpeldsp"
svq1_encoder_select="aandcttables hpeldsp me_cmp mpegvideoenc"
@@ -2074,7 +2077,7 @@ wmav1_decoder_select="mdct sinewin wma_freqs"
wmav1_encoder_select="mdct sinewin wma_freqs"
wmav2_decoder_select="mdct sinewin wma_freqs"
wmav2_encoder_select="mdct sinewin wma_freqs"
-wmavoice_decoder_select="lsp rdft dct mdct sinewin"
+wmavoice_decoder_select="celp_math lsp rdft dct mdct sinewin"
wmv1_decoder_select="h263_decoder"
wmv1_encoder_select="h263_encoder"
wmv2_decoder_select="blockdsp h263_decoder idctdsp intrax8 videodsp wmv2dsp"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4800779..c96531e 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -43,6 +43,9 @@ OBJS-$(CONFIG_AUDIODSP) += audiodsp.o
OBJS-$(CONFIG_BLOCKDSP) += blockdsp.o
OBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o
OBJS-$(CONFIG_CABAC) += cabac.o
+OBJS-$(CONFIG_CELP_MATH) += acelp_filters.o acelp_pitch_delay.o \
+ acelp_vectors.o celp_filters.o \
+ celp_math.o
OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o
OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o
OBJS-$(CONFIG_FAANDCT) += faandct.o
@@ -132,14 +135,8 @@ OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o
alac_data.o
OBJS-$(CONFIG_ALIAS_PIX_DECODER) += aliaspixdec.o
OBJS-$(CONFIG_ALIAS_PIX_ENCODER) += aliaspixenc.o
OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mpeg4audio.o
-OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o \
- celp_math.o acelp_filters.o \
- acelp_vectors.o \
- acelp_pitch_delay.o
-OBJS-$(CONFIG_AMRWB_DECODER) += amrwbdec.o celp_filters.o \
- celp_math.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_ANM_DECODER) += anm.o
OBJS-$(CONFIG_ANSI_DECODER) += ansi.o cga_data.o
OBJS-$(CONFIG_APE_DECODER) += apedec.o
@@ -228,10 +225,8 @@ OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o
OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o
OBJS-$(CONFIG_FRWU_DECODER) += frwu.o
OBJS-$(CONFIG_G2M_DECODER) += g2meet.o elsdec.o
-OBJS-$(CONFIG_G723_1_DECODER) += g723_1dec.o g723_1.o \
- acelp_vectors.o celp_filters.o
-OBJS-$(CONFIG_G723_1_ENCODER) += g723_1enc.o g723_1.o \
- acelp_vectors.o celp_filters.o
+OBJS-$(CONFIG_G723_1_DECODER) += g723_1dec.o g723_1.o
+OBJS-$(CONFIG_G723_1_ENCODER) += g723_1enc.o g723_1.o
OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o
OBJS-$(CONFIG_GIF_ENCODER) += gif.o lzwenc.o
OBJS-$(CONFIG_GSM_DECODER) += gsmdec.o gsmdec_data.o msgsmdec.o
@@ -361,9 +356,7 @@ OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o
OBJS-$(CONFIG_PRORES_DECODER) += proresdec.o proresdata.o proresdsp.o
OBJS-$(CONFIG_PRORES_ENCODER) += proresenc.o proresdata.o
OBJS-$(CONFIG_PTX_DECODER) += ptx.o
-OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o \
- celp_filters.o acelp_vectors.o \
- acelp_filters.o
+OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o
OBJS-$(CONFIG_QDM2_DECODER) += qdm2.o
OBJS-$(CONFIG_QDRAW_DECODER) += qdrw.o
OBJS-$(CONFIG_QPEG_DECODER) += qpeg.o
@@ -397,10 +390,7 @@ OBJS-$(CONFIG_SGI_DECODER) += sgidec.o
OBJS-$(CONFIG_SGI_ENCODER) += sgienc.o rle.o
OBJS-$(CONFIG_SGIRLE_DECODER) += sgirledec.o
OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o
-OBJS-$(CONFIG_SIPR_DECODER) += sipr.o acelp_pitch_delay.o \
- celp_math.o acelp_vectors.o \
- acelp_filters.o celp_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
@@ -468,9 +458,7 @@ OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o
wma_common.o aactab.o
OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o wma_common.o aactab.o
OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o wma_common.o aactab.o
OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o wma_common.o aactab.o
-OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \
- celp_filters.o \
- acelp_vectors.o acelp_filters.o
+OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o
OBJS-$(CONFIG_WMV1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o
OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o \
msmpeg4dec.o msmpeg4.o msmpeg4data.o
--
2.6.4
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
