RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2' 

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-04-21 16:01:47 +01:00
parent ba2d37e9ad 3ee2ec5ec1
commit 7e3d3a6a89
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/unix.c
View File

@ -72,6 +72,9 @@ static int unix_open(URLContext *h, const char *filename, int flags)
if ((fd = ff_socket(AF_UNIX, s->type, 0)) < 0) if ((fd = ff_socket(AF_UNIX, s->type, 0)) < 0)
return ff_neterrno(); return ff_neterrno();
if (s->timeout < 0 && h->rw_timeout)
s->timeout = h->rw_timeout / 1000;
if (s->listen) { if (s->listen) {
ret = ff_listen_bind(fd, (struct sockaddr *)&s->addr, ret = ff_listen_bind(fd, (struct sockaddr *)&s->addr,
sizeof(s->addr), s->timeout, h); sizeof(s->addr), s->timeout, h);