aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2015-05-22 00:32:17 -0300
committerMartin Storsjö <martin@martin.st>2015-05-22 12:21:38 +0300
commit29216d7fd14d1cec16821867d17c90b5c49e8c07 (patch)
treef303449133bbafc3b768edb437ee85bdee4c80eb
parent94599a6de3822b13c94096d764868128f388ba28 (diff)
downloadffmpeg-29216d7fd14d1cec16821867d17c90b5c49e8c07.tar.gz
tls: fix compilation when both gnutls and openssl are enabled
Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavformat/tls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/tls.c b/libavformat/tls.c
index 7ce981735f..00fe876a42 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