diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-24 12:57:46 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-24 12:59:21 +0100 |
| commit | fc83de7e1d0eab29942b4ceb67b49e66e7b99226 (patch) | |
| tree | 5f7f516d565585419d21c31839b00552f5375404 /libavformat/tls_openssl.c | |
| parent | 2c47d243585a090ec90c97109a44f2a6d13d5f7c (diff) | |
| parent | ee050797664c7c74cae262ffab05006b55d47a11 (diff) | |
| download | ffmpeg-fc83de7e1d0eab29942b4ceb67b49e66e7b99226.tar.gz | |
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 <u@pkh.me>
Diffstat (limited to 'libavformat/tls_openssl.c')
| -rw-r--r-- | libavformat/tls_openssl.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 3d9768a805..38af8a21c0 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); |