Merge commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 21 Apr 2016 15:01:47 +0000 (16:01 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 21 Apr 2016 15:01:50 +0000 (16:01 +0100)
commit7e3d3a6a895f80e8a376a3ba37054eb84b44f671
tree69b8694d440048f56ffc12a035425448c619779c
parentba2d37e9ada5239e4b856996136e4ee859863b16
parent3ee2ec5ec1e39a438f89302d949c93a1b5d365a2
Merge commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2'

* commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2':
  unix: Use rw_timeout for setting the connect timeout

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/unix.c