Author: hyc Date: Wed Oct 27 01:51:10 2010 New Revision: 552 Log: Timeout fix from Antti Ajanki Modified: trunk/librtmp/rtmp.c trunk/rtmpdump.c Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Fri Oct 8 09:45:54 2010 (r551) +++ trunk/librtmp/rtmp.c Wed Oct 27 01:51:10 2010 (r552) @@ -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; Modified: trunk/rtmpdump.c ============================================================================== --- trunk/rtmpdump.c Fri Oct 8 09:45:54 2010 (r551) +++ trunk/rtmpdump.c Wed Oct 27 01:51:10 2010 (r552) @@ -583,7 +583,7 @@ Download(RTMP * rtmp, // connected RTMP #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;