OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
136c343
)
unix: Use rw_timeout for setting the connect timeout
author
Martin Storsjö
<martin@martin.st>
Fri, 27 Feb 2015 23:47:20 +0000
(
01:47
+0200)
committer
Martin Storsjö
<martin@martin.st>
Thu, 24 Mar 2016 08:34:29 +0000
(10:34 +0200)
Signed-off-by: Martin Storsjö <martin@martin.st>
libavformat/unix.c
patch
|
blob
|
history
diff --git
a/libavformat/unix.c
b/libavformat/unix.c
index
6bb677d
..
647e7e8
100644
(file)
--- 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);