RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7' 

* commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7':
  configure: Properly set zlib dependencies for all components

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-06 19:29:02 +02:00
parent 05f1b4e2ec 61c31e4ee7
commit c32db6adab
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure vendored
View File

@ -1764,28 +1764,29 @@ 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_select="zlib" dxa_decoder_deps="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_select="zlib" exr_decoder_deps="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_select="zlib" flashsv_decoder_deps="zlib"
flashsv_encoder_select="zlib" flashsv_encoder_deps="zlib"
flashsv2_encoder_select="zlib" flashsv2_encoder_deps="zlib"
flashsv2_decoder_select="zlib" flashsv2_decoder_deps="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_select="dsputil zlib" g2m_decoder_deps="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"
@ -1844,8 +1845,9 @@ mxpeg_decoder_select="dsputil hpeldsp"
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_select="zlib" png_decoder_deps="zlib"
png_encoder_select="dsputil zlib" png_encoder_deps="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"
@ -1879,7 +1881,7 @@ thp_decoder_select="dsputil hpeldsp"
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_select="zlib" tscc_decoder_deps="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"
@ -1907,11 +1909,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_select="zlib" zerocodec_decoder_deps="zlib"
zlib_decoder_select="zlib" zlib_decoder_deps="zlib"
zlib_encoder_select="zlib" zlib_encoder_deps="zlib"
zmbv_decoder_select="zlib" zmbv_decoder_deps="zlib"
zmbv_encoder_select="zlib" zmbv_encoder_deps="zlib"
# hardware accelerators # hardware accelerators
crystalhd_deps="libcrystalhd_libcrystalhd_if_h" crystalhd_deps="libcrystalhd_libcrystalhd_if_h"