ffmpeg | branch: master | Clément Bœsch <[email protected]> | Fri Mar 24 12:57:46 2017 +0100| [fc83de7e1d0eab29942b4ceb67b49e66e7b99226] | committer: Clément Bœsch
Merge commit 'ee050797664c7c74cae262ffab05006b55d47a11' * commit 'ee050797664c7c74cae262ffab05006b55d47a11': openssl: Support version 1.1.0. This commit is mostly a noop, see 798c6ecce50f26a53d48e2577a34fabe46b32eb9 Included the simplifications by Martin Storsjö and fixed the GET_BIO_DATA() macro to prevent a warning after the simplifications. Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc83de7e1d0eab29942b4ceb67b49e66e7b99226 --- libavformat/tls_openssl.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 3d9768a..38af8a2 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -86,17 +86,15 @@ static int url_bio_destroy(BIO *b) } #if OPENSSL_VERSION_NUMBER >= 0x1010000fL -#define GET_BIO_DATA(x) BIO_get_data(x); +#define GET_BIO_DATA(x) BIO_get_data(x) #else -#define GET_BIO_DATA(x) (x)->ptr; +#define GET_BIO_DATA(x) (x)->ptr #endif static int url_bio_bread(BIO *b, char *buf, int len) { - URLContext *h; - int ret; - h = GET_BIO_DATA(b); - ret = ffurl_read(h, buf, len); + URLContext *h = GET_BIO_DATA(b); + int ret = ffurl_read(h, buf, len); if (ret >= 0) return ret; BIO_clear_retry_flags(b); @@ -107,10 +105,8 @@ static int url_bio_bread(BIO *b, char *buf, int len) static int url_bio_bwrite(BIO *b, const char *buf, int len) { - URLContext *h; - int ret; - h = GET_BIO_DATA(b); - ret = ffurl_write(h, buf, len); + URLContext *h = GET_BIO_DATA(b); + int ret = ffurl_write(h, buf, len); if (ret >= 0) return ret; BIO_clear_retry_flags(b); ====================================================================== diff --cc libavformat/tls_openssl.c index 3d9768a,4d94774..38af8a2 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@@ -86,9 -152,9 +86,9 @@@ static int url_bio_destroy(BIO *b } #if OPENSSL_VERSION_NUMBER >= 0x1010000fL --#define GET_BIO_DATA(x) BIO_get_data(x); ++#define GET_BIO_DATA(x) BIO_get_data(x) #else --#define GET_BIO_DATA(x) (x)->ptr; ++#define GET_BIO_DATA(x) (x)->ptr #endif static int url_bio_bread(BIO *b, char *buf, int len) _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
