summaryrefslogtreecommitdiff
path: root/libavformat/tcp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-05-30 02:36:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-30 02:36:49 +0200
commita22500744bf878e1c8f9dfd1c6695e861f544780 (patch)
treec895960cc25a3c419557db895e4a426031843f4e /libavformat/tcp.c
parent5a35cef4b102ba99c31f83db8092b4d36383b044 (diff)
Revert "Timeout TCP open() after 5 seconds."
This code is redundant and conflicts with lucas reimplementation of it. This reverts commit a2f5e14a867768019b49b830e29801f1bfb2abb7.
Diffstat (limited to 'libavformat/tcp.c')
-rw-r--r--libavformat/tcp.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index b144e31457..963a993495 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -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);