diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-02 22:41:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-02 22:50:19 +0200 |
| commit | 21e40f006aac36e41d3d6074928d584f0be51ada (patch) | |
| tree | 61b6f610471fc47a3ac36a0231d9b8e85b3df390 | |
| parent | 12a83bc0aa4bf680805757fd5e025adf3b16c526 (diff) | |
| parent | 876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de (diff) | |
| download | ffmpeg-21e40f006aac36e41d3d6074928d584f0be51ada.tar.gz | |
Merge commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de'
* commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de':
configure: don't enable tls protocols if network is disabled
Conflicts:
configure
See: 7fc6545d5d7301196d1c23a45a24a9707bac0060
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -2649,14 +2649,13 @@ sctp_protocol_deps="struct_sctp_event_subscribe" sctp_protocol_select="network" srtp_protocol_select="rtp_protocol" tcp_protocol_select="network" -tls_securetransport_protocol_deps="securetransport" tls_gnutls_protocol_deps="gnutls !tls_securetransport_protocol" -tls_openssl_protocol_deps="openssl !tls_securetransport_protocol !tls_gnutls_protocol" tls_gnutls_protocol_select="tcp_protocol" +tls_openssl_protocol_deps="openssl !tls_securetransport_protocol !tls_gnutls_protocol" tls_openssl_protocol_select="tcp_protocol" +tls_securetransport_protocol_deps="securetransport" tls_securetransport_protocol_select="tcp_protocol" tls_protocol_deps_any="tls_securetransport_protocol tls_gnutls_protocol tls_openssl_protocol" -tls_protocol_select="tcp_protocol" udp_protocol_select="network" udplite_protocol_select="network" unix_protocol_deps="sys_un_h" |