---
Previously approved.
---
libavformat/unix.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/unix.c b/libavformat/unix.c
index 6bb677d..647e7e8 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);
--
2.5.4 (Apple Git-61)
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
