diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtsp.c | 5 | ||||
| -rw-r--r-- | libavformat/rtsp.h | 4 | ||||
| -rw-r--r-- | libavformat/rtspdec.c | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 4ba5cef..431703e 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -724,9 +724,10 @@ void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf, } else if (av_stristart(p, "Authentication-Info:", &p) && rt) { p += strspn(p, SPACE_CHARS); ff_http_auth_handle_header(&rt->auth_state, "Authentication-Info", p); - } else if (av_stristart(p, "Content-Base:", &p)) { + } else if (av_stristart(p, "Content-Base:", &p) && rt) { p += strspn(p, SPACE_CHARS); - av_strlcpy(reply->content_base, p , sizeof(reply->content_base)); + if (method && !strcmp(method, "DESCRIBE")) + av_strlcpy(rt->control_uri, p , sizeof(rt->control_uri)); } } diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 2680297..628ce37 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -165,10 +165,6 @@ typedef struct RTSPMessageHeader { * returned */ char reason[256]; - - /** The "Content-Base:" field. - */ - char content_base[4096]; } RTSPMessageHeader; /** diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 2ebc515..13fa969 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -107,9 +107,6 @@ int ff_rtsp_setup_input_streams(AVFormatContext *s, RTSPMessageHeader *reply) av_freep(&content); return AVERROR_INVALIDDATA; } - if (reply->content_base[0]) - av_strlcpy(rt->control_uri, reply->content_base, - sizeof(rt->control_uri)); av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", content); /* now we got the SDP description, we parse it */ |
