diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:29:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:29:27 +0200 |
| commit | c32db6adab9942781cc5a23f62abb839a5595a83 (patch) | |
| tree | cb082f4a4cb29801263d950edfe8970cad51d259 | |
| parent | 05f1b4e2ecc4683467669a190e3a53df413de805 (diff) | |
| parent | 61c31e4ee7ea79a9e74c0476b81244febf17e6d7 (diff) | |
| download | ffmpeg-c32db6adab9942781cc5a23f62abb839a5595a83.tar.gz | |
Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'
* commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7':
configure: Properly set zlib dependencies for all components
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 32 |
1 files changed, 17 insertions, 15 deletions
@@ -1764,28 +1764,29 @@ dnxhd_decoder_select="dsputil" dnxhd_encoder_select="aandcttables dsputil mpegvideoenc" dvvideo_decoder_select="dsputil" dvvideo_encoder_select="dsputil" -dxa_decoder_select="zlib" +dxa_decoder_deps="zlib" eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" eamad_decoder_select="aandcttables dsputil mpegvideo" eatgq_decoder_select="aandcttables" eatqi_decoder_select="aandcttables error_resilience mpegvideo" -exr_decoder_select="zlib" +exr_decoder_deps="zlib" ffv1_decoder_select="dsputil golomb rangecoder" ffv1_encoder_select="dsputil rangecoder" ffvhuff_decoder_select="dsputil" ffvhuff_encoder_select="dsputil huffman" flac_decoder_select="golomb" flac_encoder_select="dsputil golomb lpc" -flashsv_decoder_select="zlib" -flashsv_encoder_select="zlib" -flashsv2_encoder_select="zlib" -flashsv2_decoder_select="zlib" +flashsv_decoder_deps="zlib" +flashsv_encoder_deps="zlib" +flashsv2_encoder_deps="zlib" +flashsv2_decoder_deps="zlib" flv_decoder_select="h263_decoder" flv_encoder_select="h263_encoder" fourxm_decoder_select="dsputil" fraps_decoder_select="dsputil huffman" -g2m_decoder_select="dsputil zlib" +g2m_decoder_deps="zlib" +g2m_decoder_select="dsputil" g729_decoder_select="dsputil" h261_decoder_select="error_resilience mpegvideo" h261_encoder_select="aandcttables mpegvideoenc" @@ -1844,8 +1845,9 @@ mxpeg_decoder_select="dsputil hpeldsp" nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin" nuv_decoder_select="dsputil lzo" -png_decoder_select="zlib" -png_encoder_select="dsputil zlib" +png_decoder_deps="zlib" +png_encoder_deps="zlib" +png_encoder_select="dsputil" prores_decoder_select="dsputil" prores_encoder_select="dsputil" qcelp_decoder_select="lsp" @@ -1879,7 +1881,7 @@ thp_decoder_select="dsputil hpeldsp" truehd_decoder_select="mlp_parser" truemotion2_decoder_select="dsputil" truespeech_decoder_select="dsputil" -tscc_decoder_select="zlib" +tscc_decoder_deps="zlib" twinvq_decoder_select="mdct lsp sinewin" utvideo_decoder_select="dsputil" utvideo_encoder_select="dsputil huffman" @@ -1907,11 +1909,11 @@ wmv2_decoder_select="h263_decoder videodsp" wmv2_encoder_select="h263_encoder" wmv3_decoder_select="vc1_decoder" wmv3image_decoder_select="wmv3_decoder" -zerocodec_decoder_select="zlib" -zlib_decoder_select="zlib" -zlib_encoder_select="zlib" -zmbv_decoder_select="zlib" -zmbv_encoder_select="zlib" +zerocodec_decoder_deps="zlib" +zlib_decoder_deps="zlib" +zlib_encoder_deps="zlib" +zmbv_decoder_deps="zlib" +zmbv_encoder_deps="zlib" # hardware accelerators crystalhd_deps="libcrystalhd_libcrystalhd_if_h" |