diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:06:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:06:42 +0100 |
| commit | 7fce8c752d87ca4738179bb7e9238bae67abdeac (patch) | |
| tree | cf884999bbf61ac8a23cc37843915e49e51a42d7 /configure | |
| parent | 5c17377e28e818d3074a608d42821d66f1d26e8d (diff) | |
| parent | 71f1ad37d858b810b71a4af1c25771beaa50b27b (diff) | |
Merge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'
* commit '71f1ad37d858b810b71a4af1c25771beaa50b27b':
lavc: do not compile fmtconvert unconditionally
Conflicts:
configure
libavcodec/ppc/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1856,6 +1856,7 @@ CONFIG_EXTRA=" faandct faanidct fdctdsp + fmtconvert frame_thread_encoder gcrypt golomb @@ -2074,7 +2075,7 @@ mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp" aac_decoder_select="imdct15 mdct sinewin" aac_encoder_select="audio_frame_queue iirfilter mdct sinewin" aac_latm_decoder_select="aac_decoder aac_latm_parser" -ac3_decoder_select="ac3_parser ac3dsp bswapdsp mdct" +ac3_decoder_select="ac3_parser ac3dsp bswapdsp fmtconvert mdct" ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp mdct" ac3_encoder_select="ac3dsp audiodsp mdct me_cmp" ac3_fixed_encoder_select="ac3dsp audiodsp mdct me_cmp" @@ -2104,7 +2105,7 @@ comfortnoise_encoder_select="lpc" cook_decoder_select="audiodsp mdct sinewin" cscd_decoder_select="lzo" cscd_decoder_suggest="zlib" -dca_decoder_select="mdct" +dca_decoder_select="fmtconvert mdct" dirac_decoder_select="dwt golomb videodsp mpegvideoenc" dnxhd_decoder_select="blockdsp idctdsp" dnxhd_encoder_select="aandcttables blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp" |