Commit ad8fbddb authored by Michael Niedermayer's avatar Michael Niedermayer

Revert "Merge commit '61c31e4e'" (configure:...

Revert "Merge commit '61c31e4e'" (configure: Properly set zlib dependencies for all components)

The reverted commit introduced undefined behavior.
undefined in the sense that the evaluation order of the dependencies affects the results

Fixes Ticket2920

This reverts commit c32db6ad, reversing
changes made to 05f1b4e2.

Alternative solutions would be to change the dependency solver to handle non trivial
dependencies or to enable zlib by default before the dependency solver, this would
leave a zlib dependency in the libs though then even when no zlib is needed or used.
parent edadda96
...@@ -1776,29 +1776,28 @@ dnxhd_decoder_select="dsputil" ...@@ -1776,29 +1776,28 @@ dnxhd_decoder_select="dsputil"
dnxhd_encoder_select="aandcttables dsputil mpegvideoenc" dnxhd_encoder_select="aandcttables dsputil mpegvideoenc"
dvvideo_decoder_select="dsputil" dvvideo_decoder_select="dsputil"
dvvideo_encoder_select="dsputil" dvvideo_encoder_select="dsputil"
dxa_decoder_deps="zlib" dxa_decoder_select="zlib"
eac3_decoder_select="ac3_decoder" eac3_decoder_select="ac3_decoder"
eac3_encoder_select="ac3_encoder" eac3_encoder_select="ac3_encoder"
eamad_decoder_select="aandcttables dsputil mpegvideo" eamad_decoder_select="aandcttables dsputil mpegvideo"
eatgq_decoder_select="aandcttables" eatgq_decoder_select="aandcttables"
eatqi_decoder_select="aandcttables error_resilience mpegvideo" eatqi_decoder_select="aandcttables error_resilience mpegvideo"
exr_decoder_deps="zlib" exr_decoder_select="zlib"
ffv1_decoder_select="dsputil golomb rangecoder" ffv1_decoder_select="dsputil golomb rangecoder"
ffv1_encoder_select="dsputil rangecoder" ffv1_encoder_select="dsputil rangecoder"
ffvhuff_decoder_select="dsputil" ffvhuff_decoder_select="dsputil"
ffvhuff_encoder_select="dsputil huffman" ffvhuff_encoder_select="dsputil huffman"
flac_decoder_select="golomb" flac_decoder_select="golomb"
flac_encoder_select="dsputil golomb lpc" flac_encoder_select="dsputil golomb lpc"
flashsv_decoder_deps="zlib" flashsv_decoder_select="zlib"
flashsv_encoder_deps="zlib" flashsv_encoder_select="zlib"
flashsv2_encoder_deps="zlib" flashsv2_encoder_select="zlib"
flashsv2_decoder_deps="zlib" flashsv2_decoder_select="zlib"
flv_decoder_select="h263_decoder" flv_decoder_select="h263_decoder"
flv_encoder_select="h263_encoder" flv_encoder_select="h263_encoder"
fourxm_decoder_select="dsputil" fourxm_decoder_select="dsputil"
fraps_decoder_select="dsputil huffman" fraps_decoder_select="dsputil huffman"
g2m_decoder_deps="zlib" g2m_decoder_select="dsputil zlib"
g2m_decoder_select="dsputil"
g729_decoder_select="dsputil" g729_decoder_select="dsputil"
h261_decoder_select="error_resilience mpegvideo" h261_decoder_select="error_resilience mpegvideo"
h261_encoder_select="aandcttables mpegvideoenc" h261_encoder_select="aandcttables mpegvideoenc"
...@@ -1858,9 +1857,8 @@ mxpeg_decoder_select="dsputil hpeldsp exif" ...@@ -1858,9 +1857,8 @@ mxpeg_decoder_select="dsputil hpeldsp exif"
nellymoser_decoder_select="mdct sinewin" nellymoser_decoder_select="mdct sinewin"
nellymoser_encoder_select="audio_frame_queue mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin"
nuv_decoder_select="dsputil lzo" nuv_decoder_select="dsputil lzo"
png_decoder_deps="zlib" png_decoder_select="zlib"
png_encoder_deps="zlib" png_encoder_select="dsputil zlib"
png_encoder_select="dsputil"
prores_decoder_select="dsputil" prores_decoder_select="dsputil"
prores_encoder_select="dsputil" prores_encoder_select="dsputil"
qcelp_decoder_select="lsp" qcelp_decoder_select="lsp"
...@@ -1894,7 +1892,7 @@ thp_decoder_select="dsputil hpeldsp exif" ...@@ -1894,7 +1892,7 @@ thp_decoder_select="dsputil hpeldsp exif"
truehd_decoder_select="mlp_parser" truehd_decoder_select="mlp_parser"
truemotion2_decoder_select="dsputil" truemotion2_decoder_select="dsputil"
truespeech_decoder_select="dsputil" truespeech_decoder_select="dsputil"
tscc_decoder_deps="zlib" tscc_decoder_select="zlib"
twinvq_decoder_select="mdct lsp sinewin" twinvq_decoder_select="mdct lsp sinewin"
utvideo_decoder_select="dsputil" utvideo_decoder_select="dsputil"
utvideo_encoder_select="dsputil huffman" utvideo_encoder_select="dsputil huffman"
...@@ -1922,11 +1920,11 @@ wmv2_decoder_select="h263_decoder videodsp" ...@@ -1922,11 +1920,11 @@ wmv2_decoder_select="h263_decoder videodsp"
wmv2_encoder_select="h263_encoder" wmv2_encoder_select="h263_encoder"
wmv3_decoder_select="vc1_decoder" wmv3_decoder_select="vc1_decoder"
wmv3image_decoder_select="wmv3_decoder" wmv3image_decoder_select="wmv3_decoder"
zerocodec_decoder_deps="zlib" zerocodec_decoder_select="zlib"
zlib_decoder_deps="zlib" zlib_decoder_select="zlib"
zlib_encoder_deps="zlib" zlib_encoder_select="zlib"
zmbv_decoder_deps="zlib" zmbv_decoder_select="zlib"
zmbv_encoder_deps="zlib" zmbv_encoder_select="zlib"
# hardware accelerators # hardware accelerators
crystalhd_deps="libcrystalhd_libcrystalhd_if_h" crystalhd_deps="libcrystalhd_libcrystalhd_if_h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment