Commit d2995eb9 authored by Martin Storsjö's avatar Martin Storsjö

rtsp: Store the Content-Base header value straight to the target

This avoids having a large temporary buffer in the struct used for
storing the rtsp reply headers.

Originally committed as revision 26192 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 77223c53
...@@ -724,9 +724,10 @@ void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf, ...@@ -724,9 +724,10 @@ void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
} else if (av_stristart(p, "Authentication-Info:", &p) && rt) { } else if (av_stristart(p, "Authentication-Info:", &p) && rt) {
p += strspn(p, SPACE_CHARS); p += strspn(p, SPACE_CHARS);
ff_http_auth_handle_header(&rt->auth_state, "Authentication-Info", p); 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); 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));
} }
} }
......
...@@ -165,10 +165,6 @@ typedef struct RTSPMessageHeader { ...@@ -165,10 +165,6 @@ typedef struct RTSPMessageHeader {
* returned * returned
*/ */
char reason[256]; char reason[256];
/** The "Content-Base:" field.
*/
char content_base[4096];
} RTSPMessageHeader; } RTSPMessageHeader;
/** /**
......
...@@ -107,9 +107,6 @@ int ff_rtsp_setup_input_streams(AVFormatContext *s, RTSPMessageHeader *reply) ...@@ -107,9 +107,6 @@ int ff_rtsp_setup_input_streams(AVFormatContext *s, RTSPMessageHeader *reply)
av_freep(&content); av_freep(&content);
return AVERROR_INVALIDDATA; 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); av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", content);
/* now we got the SDP description, we parse it */ /* now we got the SDP description, we parse it */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment