[FFmpeg-cvslog] Merge commit 'f6161fccf8c5720ceac1ed1df8ba60ff8fed69f5'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Dec 10 20:44:26 2017 -0300| [dae6d27aa0b02e05790b7c4dc99f7f6b07223ea1] | committer: James Almer

Merge commit 'f6161fccf8c5720ceac1ed1df8ba60ff8fed69f5'

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

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dae6d27aa0b02e05790b7c4dc99f7f6b07223ea1
---

 libavformat/rtsp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index b6da61b95e..cf7cdb2f2b 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -2009,7 +2009,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) {


======================================================================