From 61c31e4ee7ea79a9e74c0476b81244febf17e6d7 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 6 Aug 2013 02:31:33 +0200 Subject: [PATCH] configure: Properly set zlib dependencies for all components --- configure | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 57582b98fe..8efff2725c 100755 --- a/configure +++ b/configure @@ -1563,7 +1563,7 @@ 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" @@ -1575,14 +1575,15 @@ 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_decoder_select="zlib" +flashsv_decoder_deps="zlib" +flashsv_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" h261_decoder_select="error_resilience mpegvideo" h261_encoder_select="aandcttables mpegvideoenc" h263_decoder_select="error_resilience h263_parser mpegvideo" @@ -1640,8 +1641,10 @@ 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="dsputil zlib" -png_encoder_select="dsputil zlib" +png_decoder_deps="zlib" +png_decoder_select="dsputil" +png_encoder_deps="zlib" +png_encoder_select="dsputil" prores_decoder_select="dsputil" prores_encoder_select="dsputil" qcelp_decoder_select="lsp" @@ -1669,7 +1672,7 @@ thp_decoder_select="dsputil hpeldsp" truehd_decoder_select="mlp_decoder" 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" @@ -1696,11 +1699,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 dxva2_deps="dxva2api_h"