[FFmpeg-cvslog] tls: fix compilation when both gnutls and openssl are enabled

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri May 22 00:32:17 2015 -0300| [29216d7fd14d1cec16821867d17c90b5c49e8c07] | committer: Martin Storsjö

tls: fix compilation when both gnutls and openssl are enabled

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavformat/tls.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/tls.c b/libavformat/tls.c
index 7ce9817..00fe876 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