diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2013-06-01 19:38:57 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2013-06-04 14:56:52 +0200 |
commit | 9835abb6d63fb07613994ae90e72fef758149408 (patch) | |
tree | cba69659a7ae4c4b30dd7728862e5b150a368efc /libavformat/tcp.c | |
parent | 7c020e1ad37d27c9d5db4d714401f09c80e3cc44 (diff) | |
download | ffmpeg-9835abb6d63fb07613994ae90e72fef758149408.tar.gz |
network: uniform ff_listen_bind and ff_listen_connect
Document the functions and have both use a millisecond timeout and
check for interrupt.
Diffstat (limited to 'libavformat/tcp.c')
-rw-r--r-- | libavformat/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/tcp.c b/libavformat/tcp.c index fff9e1fcd4..67aebdfcb8 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -92,13 +92,13 @@ static int tcp_open(URLContext *h, const char *uri, int flags) if (listen_socket) { if ((fd = ff_listen_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, - listen_timeout)) < 0) { + listen_timeout, h)) < 0) { ret = fd; goto fail1; } } else { if ((ret = ff_listen_connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, - timeout, h)) < 0) { + timeout * 100, h)) < 0) { if (ret == AVERROR_EXIT) goto fail1; |