Module: libav Branch: master Commit: 29216d7fd14d1cec16821867d17c90b5c49e8c07
Author: James Almer <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Fri May 22 00:32:17 2015 -0300 tls: fix compilation when both gnutls and openssl are enabled Signed-off-by: Martin Storsjö <[email protected]> --- 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 _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
