From 9ca7e22d94c6e07e8ef05acbf636809a5914f50c Mon Sep 17 00:00:00 2001 From: hyc Date: Tue, 26 Oct 2010 23:51:10 +0000 Subject: [PATCH] Timeout fix from Antti Ajanki git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@552 400ebc74-4327-4243-bc38-086b20814532 --- librtmp/rtmp.c | 3 +++ rtmpdump.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 3e4e00a..db882dc 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -1019,6 +1019,9 @@ RTMP_ToggleStream(RTMP *r) if (!r->m_pausing) { + if (RTMP_IsTimedout(r) && r->m_read.status == RTMP_READ_EOF) + r->m_read.status = 0; + res = RTMP_SendPause(r, TRUE, r->m_pauseStamp); if (!res) return res; diff --git a/rtmpdump.c b/rtmpdump.c index 7aa19ab..c1cd95b 100644 --- a/rtmpdump.c +++ b/rtmpdump.c @@ -583,7 +583,7 @@ Download(RTMP * rtmp, // connected RTMP object #endif } - while (!RTMP_ctrlC && nRead > -1 && RTMP_IsConnected(rtmp)); + while (!RTMP_ctrlC && nRead > -1 && RTMP_IsConnected(rtmp) && !RTMP_IsTimedout(rtmp)); free(buffer); if (nRead < 0) nRead = rtmp->m_read.status; -- 2.40.0