Merge commit '0671eb2346c17e8fb13784cf90ce416661fdea1c'
authorJames Almer <jamrial@gmail.com>
Fri, 3 Nov 2017 02:27:53 +0000 (23:27 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 3 Nov 2017 02:27:53 +0000 (23:27 -0300)
commit575fc7e80a1beb74f4afd6616f57cb8bfda4dba0
tree6cb60eb2d5abdcb818395b4103852cc6e63c6711
parenteaa25b09e4116f2fd649c8638021514911e908c9
parent0671eb2346c17e8fb13784cf90ce416661fdea1c
Merge commit '0671eb2346c17e8fb13784cf90ce416661fdea1c'

* commit '0671eb2346c17e8fb13784cf90ce416661fdea1c':
  tls_openssl: Readd support for nonblocking operation

Merged-by: James Almer <jamrial@gmail.com>
libavformat/tls_openssl.c