From 3ee2ec5ec1e39a438f89302d949c93a1b5d365a2 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Sat, 28 Feb 2015 01:47:20 +0200 Subject: unix: Use rw_timeout for setting the connect timeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/unix.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavformat/unix.c') diff --git a/libavformat/unix.c b/libavformat/unix.c index 6bb677d997..647e7e86ae 100644 --- a/libavformat/unix.c +++ b/libavformat/unix.c @@ -73,6 +73,9 @@ static int unix_open(URLContext *h, const char *filename, int flags) if ((fd = ff_socket(AF_UNIX, s->type, 0)) < 0) return ff_neterrno(); + if (s->timeout < 0 && h->rw_timeout) + s->timeout = h->rw_timeout / 1000; + if (s->listen) { ret = ff_listen_bind(fd, (struct sockaddr *)&s->addr, sizeof(s->addr), s->timeout, h); -- cgit v1.2.3