Skip to content
Snippets Groups Projects
Commit 2401660d authored by Martin Storsjö's avatar Martin Storsjö
Browse files

rtsp: Return EOF if the TCP control channel is closed

Originally committed as revision 24920 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5a8693ef
No related branches found
No related tags found
No related merge requests found
...@@ -797,7 +797,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, ...@@ -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: ...@@ -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 */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment