virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

rtsp: Return EOF if the TCP control channel is closed

Browse Source 
Originally committed as revision 24920 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-08-25 13:42:17 +00:00
parent 5a8693ef59
commit 2401660d2f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtsp.c
View File

@ -797,7 +797,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
dprintf(s, "ret=%d c=%02x [%c]\n", ret, ch, ch); dprintf(s, "ret=%d c=%02x [%c]\n", ret, ch, ch);
#endif #endif
if (ret != 1) if (ret != 1)
return -1; return AVERROR_EOF;
if (ch == '\n') if (ch == '\n')
break; break;
if (ch == '$') { if (ch == '$') {
@ -1719,8 +1719,8 @@ redo:
RTSPMessageHeader reply; RTSPMessageHeader reply;
ret = ff_rtsp_read_reply(s, &reply, NULL, 1); ret = ff_rtsp_read_reply(s, &reply, NULL, 1);
if (ret == -1) if (ret < 0)
return -1; return ret;
if (ret == 1) /* received '$' */ if (ret == 1) /* received '$' */
break; break;
/* XXX: parse message */ /* XXX: parse message */