highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'f6161fccf8c5720ceac1ed1df8ba60ff8fed69f5'

Browse Source 
* commit 'f6161fccf8c5720ceac1ed1df8ba60ff8fed69f5':
  rtsp: only break on parse_rtsp_message on error

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-12-10 20:44:26 -03:00
parent 514cf22a0d f6161fccf8
commit dae6d27aa0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtsp.c
View File

@@ -2009,7 +2009,9 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
} }
#if CONFIG_RTSP_DEMUXER #if CONFIG_RTSP_DEMUXER
if (rt->rtsp_hd && p[0].revents & POLLIN) { if (rt->rtsp_hd && p[0].revents & POLLIN) {
return parse_rtsp_message(s); if ((ret = parse_rtsp_message(s)) < 0) {
return ret;
}
} }
#endif #endif
} else if (n == 0 && ++timeout_cnt >= MAX_TIMEOUTS) { } else if (n == 0 && ++timeout_cnt >= MAX_TIMEOUTS) {