[FFmpeg-cvslog] avformat/rtsp: fix parse_rtsp_message

Zhao Zhili git at videolan.org
Fri Oct 2 09:34:42 EEST 2020


ffmpeg | branch: master | Zhao Zhili <quinkblack at foxmail.com> | Sun Sep 27 19:50:27 2020 +0800| [a191d4166f8fafaf415ebc489ebbc8f6d8d174fe] | committer: Martin Storsjö

avformat/rtsp: fix parse_rtsp_message

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ö <martin at martin.st>

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

 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 {



More information about the ffmpeg-cvslog mailing list