ffmpeg | branch: master | Derek Buitenhuis <derek.buitenh...@gmail.com> | Thu Apr 21 16:01:47 2016 +0100| [7e3d3a6a895f80e8a376a3ba37054eb84b44f671] | committer: Derek Buitenhuis
Merge commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2' * commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2': unix: Use rw_timeout for setting the connect timeout Merged-by: Derek Buitenhuis <derek.buitenh...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e3d3a6a895f80e8a376a3ba37054eb84b44f671 --- libavformat/unix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/unix.c b/libavformat/unix.c index 70d00ef..4f01d14 100644 --- a/libavformat/unix.c +++ b/libavformat/unix.c @@ -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) 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); ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
