[FFmpeg-cvslog] configure: don't enable any tls protocol if network is disabled

James Almer git at videolan.org
Mon Jun 1 22:50:57 CEST 2015


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Jun  1 16:42:37 2015 -0300| [7fc6545d5d7301196d1c23a45a24a9707bac0060] | committer: James Almer

configure: don't enable any tls protocol if network is disabled

This was a regression introduced with 4a006b9eb7e7d736fd00e6045b5612978ef6404b.

Reviewed-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fc6545d5d7301196d1c23a45a24a9707bac0060
---

 configure |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure b/configure
index aabcdc2..8460bc6 100755
--- a/configure
+++ b/configure
@@ -2652,6 +2652,9 @@ 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_select="tcp_protocol"
+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"



More information about the ffmpeg-cvslog mailing list