diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:56:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:56:00 +0200 |
| commit | 65b0f7ce08170dd2ca2998d42e0bd9f1cb82e76c (patch) | |
| tree | a4711fea10b2647a84c50f95e19d07c818c9c7d5 | |
| parent | 115a9b5091cd1be8d370f2d7ec1821df595decc7 (diff) | |
| parent | a623aa0069dff586241ad2ffedcd45ed840e2553 (diff) | |
| download | ffmpeg-65b0f7ce08170dd2ca2998d42e0bd9f1cb82e76c.tar.gz | |
Merge commit 'a623aa0069dff586241ad2ffedcd45ed840e2553'
* commit 'a623aa0069dff586241ad2ffedcd45ed840e2553':
configure: Factor out wmv2dsp module
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libavcodec/Makefile | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -1956,6 +1956,7 @@ CONFIG_EXTRA=" vp56dsp vp8dsp wma_freqs + wmv2dsp " CMDLINE_SELECT=" @@ -2352,8 +2353,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_select="zlib" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index d6a1e04733..42d908e93f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -117,6 +117,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_ZERO12V_DECODER) += 012v.o @@ -553,9 +554,9 @@ OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \ acelp_vectors.o acelp_filters.o OBJS-$(CONFIG_WMV1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_WMV1_ENCODER) += msmpeg4enc.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 |