git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
network: uniform ff_listen_bind and ff_listen_connect
[ffmpeg.git]
/
libavformat
/
tcp.c
diff --git
a/libavformat/tcp.c
b/libavformat/tcp.c
index
fff9e1f
..
67aebdf
100644
(file)
--- 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,
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,
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;
if (ret == AVERROR_EXIT)
goto fail1;