On Fri, 27 Jan 2017 18:41:09 +0000 Mark Thompson <s...@jkqxz.net> wrote:
> On 27/01/17 17:31, Marek Behún wrote: > > Use the LIBRESSL_VERSION_NUMBER macro to determine if building with > > LibreSSL instead of OpenSSL. This is pretty straightforward, since > > it is enough to add this check to existing #if macros. > > > > Signed-off-by: Marek Behun <ka...@blackhole.sk> > > --- > > libavformat/tls_openssl.c | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c > > index 3d9768a..cf1a62e 100644 > > --- a/libavformat/tls_openssl.c > > +++ b/libavformat/tls_openssl.c > > @@ -43,7 +43,7 @@ typedef struct TLSContext { > > TLSShared tls_shared; > > SSL_CTX *ctx; > > SSL *ssl; > > -#if OPENSSL_VERSION_NUMBER >= 0x1010000fL > > +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL > > && !defined(LIBRESSL_VERSION_NUMBER) > > I don't understand what this is trying to do. > > Does LibreSSL support the OpenSSL 1.1.0 API: > > If yes, why would the additional check be needed? > > If no, isn't this doing nothing because the first check would be > false? LibreSSL defines OPENSSL_VERSION_NUMBER to >=0x2000000, thus OPENSSL_VERSION_NUMBER is always greater than 0x1010000, but LibreSSL does not support 1.1.0 API. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel