Merge commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888'
authorJames Almer <jamrial@gmail.com>
Fri, 3 Nov 2017 02:39:28 +0000 (23:39 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 3 Nov 2017 02:39:28 +0000 (23:39 -0300)
commit2805c8dcfc3b7d3701a72cef06af5e477c6c0cdb
tree038b9c8e01f5a317fae41d634dadf74448fd2370
parent575fc7e80a1beb74f4afd6616f57cb8bfda4dba0
parenteb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888
Merge commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888'

* commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888':
  tls_gnutls: Readd support for nonblocking operation

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