Merge commit 'e3e8eab359238486dc233f7aa89b7bb3cb19ec38'

[ffmpeg] / libavformat / network.c

diff --git a/libavformat/network.c b/libavformat/network.c
index b3987a4d116cf5ee34b6d5d126042766211f4587..6c3d9def3b79a903cde10354fd8070cd28d928fc 100644 (file)
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -29,25 +29,29 @@
 
 int ff_tls_init(void)
 {
-#if CONFIG_TLS_OPENSSL_PROTOCOL
+#if CONFIG_TLS_PROTOCOL
+#if CONFIG_OPENSSL
     int ret;
     if ((ret = ff_openssl_init()) < 0)
         return ret;
 #endif
-#if CONFIG_TLS_GNUTLS_PROTOCOL
+#if CONFIG_GNUTLS
     ff_gnutls_init();
+#endif
 #endif
     return 0;
 }
 
 void ff_tls_deinit(void)
 {
-#if CONFIG_TLS_OPENSSL_PROTOCOL
+#if CONFIG_TLS_PROTOCOL
+#if CONFIG_OPENSSL
     ff_openssl_deinit();
 #endif
-#if CONFIG_TLS_GNUTLS_PROTOCOL
+#if CONFIG_GNUTLS
     ff_gnutls_deinit();
 #endif
+#endif
 }
 
 int ff_network_inited_globally;