On Fri, 22 May 2015 09:40:49 +0300 Martin Storsjö <[email protected]> wrote:
> From: James Almer <[email protected]> > > --- > While such a configuration probably doesn't make much sense, we > shouldn't fail to compile there. > --- > 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 > Looks good to me. Would be nice if this could be applied quickly. _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
