]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:18:52 +0000 (13:18 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:18:52 +0000 (13:18 -0300)
* commit '6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978':
  tls_openssl: Fix checks for SSL_ERROR_WANT_WRITE in nonblocking operation

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

Simple merge