mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Revert "Timeout TCP open() after 5 seconds."
This code is redundant and conflicts with lucas reimplementation of it.
This reverts commit a2f5e14a86
.
This commit is contained in:
parent
5a35cef4b1
commit
a22500744b
@ -97,7 +97,6 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
|
||||
}
|
||||
|
||||
if (ret < 0) {
|
||||
int timeout=50;
|
||||
struct pollfd p = {fd, POLLOUT, 0};
|
||||
ret = ff_neterrno();
|
||||
if (ret == AVERROR(EINTR)) {
|
||||
@ -120,12 +119,6 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
|
||||
ret = poll(&p, 1, 100);
|
||||
if (ret > 0)
|
||||
break;
|
||||
if(!--timeout){
|
||||
av_log(NULL, AV_LOG_ERROR,
|
||||
"TCP open %s:%d timeout\n",
|
||||
hostname, port);
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
if (ret <= 0) {
|
||||
ret = AVERROR(ETIMEDOUT);
|
||||
|
Loading…
Reference in New Issue
Block a user