From a191d4166f8fafaf415ebc489ebbc8f6d8d174fe Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Sun, 27 Sep 2020 19:50:27 +0800 Subject: [PATCH] avformat/rtsp: fix parse_rtsp_message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Remove the assumption that the message method is TEARDOWN. 2. Don't ignore the error code of ff_rtsp_parse_streaming_commands. Signed-off-by: Martin Storsjö --- libavformat/rtsp.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index ad12f2ae98..2ce09477ed 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1964,11 +1964,7 @@ static int parse_rtsp_message(AVFormatContext *s) if (rt->rtsp_flags & RTSP_FLAG_LISTEN) { if (rt->state == RTSP_STATE_STREAMING) { - if (!ff_rtsp_parse_streaming_commands(s)) - return AVERROR_EOF; - else - av_log(s, AV_LOG_WARNING, - "Unable to answer to TEARDOWN\n"); + return ff_rtsp_parse_streaming_commands(s); } else return AVERROR_EOF; } else {