From a623aa0069dff586241ad2ffedcd45ed840e2553 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Thu, 16 Jul 2015 16:11:03 +0100 Subject: [PATCH] configure: Factor out wmv2dsp module --- configure | 5 +++-- libavcodec/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 62e9e37761..0ed119307d 100755 --- a/configure +++ b/configure @@ -1641,6 +1641,7 @@ CONFIG_EXTRA=" vp56dsp vp8dsp wma_freqs + wmv2dsp " CMDLINE_SELECT=" @@ -1996,8 +1997,8 @@ wmav2_encoder_select="mdct sinewin wma_freqs" wmavoice_decoder_select="lsp rdft dct mdct sinewin" wmv1_decoder_select="h263_decoder" wmv1_encoder_select="h263_encoder" -wmv2_decoder_select="blockdsp h263_decoder idctdsp intrax8 videodsp" -wmv2_encoder_select="h263_encoder" +wmv2_decoder_select="blockdsp h263_decoder idctdsp intrax8 videodsp wmv2dsp" +wmv2_encoder_select="h263_encoder wmv2dsp" wmv3_decoder_select="vc1_decoder" wmv3image_decoder_select="wmv3_decoder" zerocodec_decoder_deps="zlib" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 38fdbbd747..6bc9ff78c2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -105,6 +105,7 @@ OBJS-$(CONFIG_VP3DSP) += vp3dsp.o OBJS-$(CONFIG_VP56DSP) += vp56dsp.o OBJS-$(CONFIG_VP8DSP) += vp8dsp.o OBJS-$(CONFIG_WMA_FREQS) += wma_freqs.o +OBJS-$(CONFIG_WMV2DSP) += wmv2dsp.o # decoders/encoders OBJS-$(CONFIG_A64MULTI_ENCODER) += a64multienc.o elbg.o @@ -459,9 +460,9 @@ OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \ celp_filters.o \ acelp_vectors.o acelp_filters.o OBJS-$(CONFIG_WMV1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2dsp.o \ +OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o \ msmpeg4dec.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2dsp.o \ +OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o \ msmpeg4.o msmpeg4enc.o msmpeg4data.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o