Merge commit 'ee050797664c7c74cae262ffab05006b55d47a11'
authorClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 11:57:46 +0000 (12:57 +0100)
committerClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 11:59:21 +0000 (12:59 +0100)
commitfc83de7e1d0eab29942b4ceb67b49e66e7b99226
tree5f7f516d565585419d21c31839b00552f5375404
parent2c47d243585a090ec90c97109a44f2a6d13d5f7c
parentee050797664c7c74cae262ffab05006b55d47a11
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>
libavformat/tls_openssl.c