summaryrefslogtreecommitdiff
path: root/libavformat/network.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat/network.c')
-rw-r--r--libavformat/network.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/libavformat/network.c b/libavformat/network.c
index b3987a4d11..6c3d9def3b 100644
--- 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;