aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/tls.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2015-05-22 00:32:17 -0300
committerJames Almer <jamrial@gmail.com>2015-05-22 00:33:33 -0300
commite91fbfd9cf17270d78c73add53fada4c217fdb5e (patch)
tree05195641ff0ce9dc6b88ad8e5b8b4910fa47cf8d /libavformat/tls.c
parentf99fed733d65d31d694641a3ce162b95eb348ac0 (diff)
downloadffmpeg-e91fbfd9cf17270d78c73add53fada4c217fdb5e.tar.gz
tls: fix compilation when both gnutls and openssl are enabled
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/tls.c')
-rw-r--r--libavformat/tls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/tls.c b/libavformat/tls.c
index 56b4a3911e..449504a96d 100644
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -239,7 +239,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