Commit a2250074 authored by Michael Niedermayer's avatar Michael Niedermayer

Revert "Timeout TCP open() after 5 seconds."

This code is redundant and conflicts with lucas reimplementation of it.

This reverts commit a2f5e14a.
parent 5a35cef4
...@@ -97,7 +97,6 @@ static int tcp_open(URLContext *h, const char *uri, int flags) ...@@ -97,7 +97,6 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
} }
if (ret < 0) { if (ret < 0) {
int timeout=50;
struct pollfd p = {fd, POLLOUT, 0}; struct pollfd p = {fd, POLLOUT, 0};
ret = ff_neterrno(); ret = ff_neterrno();
if (ret == AVERROR(EINTR)) { if (ret == AVERROR(EINTR)) {
...@@ -120,12 +119,6 @@ static int tcp_open(URLContext *h, const char *uri, int flags) ...@@ -120,12 +119,6 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
ret = poll(&p, 1, 100); ret = poll(&p, 1, 100);
if (ret > 0) if (ret > 0)
break; break;
if(!--timeout){
av_log(NULL, AV_LOG_ERROR,
"TCP open %s:%d timeout\n",
hostname, port);
goto fail;
}
} }
if (ret <= 0) { if (ret <= 0) {
ret = AVERROR(ETIMEDOUT); ret = AVERROR(ETIMEDOUT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment