diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:59:45 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:59:45 +0300 |
| commit | 77cd5193a5a5f745769123466b13aa52481436a2 (patch) | |
| tree | fe190d7439a9182dfcb8050e1072af5916d4443e /configure | |
| parent | ccd3edf81fc2f5a70f1218ce0b3595481bfec0e6 (diff) | |
| parent | 575ec60e542114b2ef5b2f88b28eeb72389dda45 (diff) | |
Merge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45'
* commit '575ec60e542114b2ef5b2f88b28eeb72389dda45':
configure: Factor out mss34dsp module
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1933,6 +1933,7 @@ CONFIG_EXTRA=" mpegaudiodsp mpegvideo mpegvideoenc + mss34dsp pixblockdsp qpeldsp qsv @@ -2267,12 +2268,14 @@ mpeg2_qsv_encoder_deps="libmfx" mpeg2_qsv_encoder_select="qsvenc" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" +msa1_decoder_select="mss34dsp" msmpeg4v1_decoder_select="h263_decoder" msmpeg4v2_decoder_select="h263_decoder" msmpeg4v2_encoder_select="h263_encoder" msmpeg4v3_decoder_select="h263_decoder" msmpeg4v3_encoder_select="h263_encoder" mss2_decoder_select="error_resilience mpeg_er qpeldsp vc1_decoder" +mts2_decoder_select="mss34dsp" mxpeg_decoder_select="mjpeg_decoder" nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin" |