[FFmpeg-cvslog] rtsp: only break on parse_rtsp_message on error
Tristan Matthews
git at videolan.org
Mon Dec 11 01:45:55 EET 2017
ffmpeg | branch: master | Tristan Matthews <tmatth at videolan.org> | Wed Nov 29 14:16:02 2017 -0500| [f6161fccf8c5720ceac1ed1df8ba60ff8fed69f5] | committer: Luca Barbato
rtsp: only break on parse_rtsp_message on error
Fix suggested by Luca Barbato.
This was causing spurious EOFs when using -rtsp_transport udp, as
reported in https://bugzilla.libav.org/show_bug.cgi?id=1103
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6161fccf8c5720ceac1ed1df8ba60ff8fed69f5
---
libavformat/rtsp.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 17a25a310e..8bf9d9e3c7 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1998,7 +1998,9 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
}
#if CONFIG_RTSP_DEMUXER
if (rt->rtsp_hd && p[0].revents & POLLIN) {
- return parse_rtsp_message(s);
+ if ((ret = parse_rtsp_message(s)) < 0) {
+ return ret;
+ }
}
#endif
} else if (n == 0 && ++timeout_cnt >= MAX_TIMEOUTS) {
More information about the ffmpeg-cvslog
mailing list