highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

This reverts commit a2f5e14a86.
This commit is contained in:
Michael Niedermayer
2011-05-30 02:36:49 +02:00
parent 5a35cef4b1
commit a22500744b
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/tcp.c
View File

@@ -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)
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);