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 /configure | |
| parent | 115a9b5091cd1be8d370f2d7ec1821df595decc7 (diff) | |
| parent | a623aa0069dff586241ad2ffedcd45ed840e2553 (diff) | |
Merge commit 'a623aa0069dff586241ad2ffedcd45ed840e2553'
* commit 'a623aa0069dff586241ad2ffedcd45ed840e2553':
configure: Factor out wmv2dsp module
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 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" |