diff options
| author | James Almer <jamrial@gmail.com> | 2017-12-10 20:44:26 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-12-10 20:44:26 -0300 |
| commit | dae6d27aa0b02e05790b7c4dc99f7f6b07223ea1 (patch) | |
| tree | 945780195b3fe2ad23b72669b8e51df22a508176 /libavformat/rtsp.c | |
| parent | 514cf22a0d3abb5126d24b44f4291394e8ef8e39 (diff) | |
| parent | f6161fccf8c5720ceac1ed1df8ba60ff8fed69f5 (diff) | |
| download | ffmpeg-dae6d27aa0b02e05790b7c4dc99f7f6b07223ea1.tar.gz | |
Merge commit 'f6161fccf8c5720ceac1ed1df8ba60ff8fed69f5'
* commit 'f6161fccf8c5720ceac1ed1df8ba60ff8fed69f5':
rtsp: only break on parse_rtsp_message on error
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 4 |
1 files changed, 3 insertions, 1 deletions
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) { |