From 29216d7fd14d1cec16821867d17c90b5c49e8c07 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Fri, 22 May 2015 00:32:17 -0300
Subject: [PATCH] tls: fix compilation when both gnutls and openssl are enabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Martin Storsjö <martin@martin.st>
---
 libavformat/tls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/tls.c b/libavformat/tls.c
index 7ce981735f0..00fe876a42d 100644
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -213,7 +213,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
     struct addrinfo hints = { 0 }, *ai = NULL;
     const char *proxy_path;
     int use_proxy;
-#if CONFIG_OPENSSL
+#if CONFIG_OPENSSL && !CONFIG_GNUTLS
     BIO *bio;
 #endif
 
-- 
GitLab