ffmpeg | branch: master | James Almer <[email protected]> | Fri May 22 00:32:17 2015 -0300| [e91fbfd9cf17270d78c73add53fada4c217fdb5e] | committer: James Almer
tls: fix compilation when both gnutls and openssl are enabled Signed-off-by: James Almer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e91fbfd9cf17270d78c73add53fada4c217fdb5e --- libavformat/tls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/tls.c b/libavformat/tls.c index 56b4a39..449504a 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 _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
