ffmpeg | branch: master | James Almer <[email protected]> | Tue Jun 2 13:24:21 2015 -0300| [876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de] | committer: Martin Storsjö
configure: don't enable tls protocols if network is disabled This was a regression introduced with d8ffb2055f0e0fcb5d025bab72eb19c2a886c125. Signed-off-by: James Almer <[email protected]> Signed-off-by: Martin Storsjö <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 30d6f18..2458adb 100755 --- a/configure +++ b/configure @@ -2215,9 +2215,10 @@ sctp_protocol_select="network" srtp_protocol_select="rtp_protocol" tcp_protocol_select="network" tls_gnutls_protocol_deps="gnutls" +tls_gnutls_protocol_select="tcp_protocol" tls_openssl_protocol_deps="openssl !tls_gnutls_protocol" +tls_openssl_protocol_select="tcp_protocol" tls_protocol_deps_any="tls_gnutls_protocol tls_openssl_protocol" -tls_protocol_select="tcp_protocol" udp_protocol_select="network" unix_protocol_deps="sys_un_h" unix_protocol_select="network" _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
