RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-25 16:21:13 +00:00
Code Issues Projects Releases Wiki Activity

rtsp: Pass the method name to ff_rtsp_parse_line

Browse Source 
Originally committed as revision 26191 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2011-01-02 10:10:12 +00:00
parent acc9ed1450
commit 77223c5388
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffserver.c
View File

@ -2895,7 +2895,7 @@ static int rtsp_parse_request(HTTPContext *c)
len = sizeof(line) - 1; len = sizeof(line) - 1;
memcpy(line, p, len); memcpy(line, p, len);
line[len] = '\0'; line[len] = '\0';
ff_rtsp_parse_line(header, line, NULL); ff_rtsp_parse_line(header, line, NULL, NULL);
p = p1 + 1; p = p1 + 1;
} }

4
libavformat/rtsp.c
View File

@ -685,7 +685,7 @@ static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p)
} }
void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf, void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
RTSPState *rt) RTSPState *rt, const char *method)
{ {
const char *p; const char *p;
@ -808,7 +808,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
reply->status_code = atoi(buf1); reply->status_code = atoi(buf1);
av_strlcpy(reply->reason, p, sizeof(reply->reason)); av_strlcpy(reply->reason, p, sizeof(reply->reason));
} else { } else {
ff_rtsp_parse_line(reply, p, rt); ff_rtsp_parse_line(reply, p, rt, method);
av_strlcat(rt->last_reply, p, sizeof(rt->last_reply)); av_strlcat(rt->last_reply, p, sizeof(rt->last_reply));
av_strlcat(rt->last_reply, "\n", sizeof(rt->last_reply)); av_strlcat(rt->last_reply, "\n", sizeof(rt->last_reply));
} }

2
libavformat/rtsp.h
View File

@ -353,7 +353,7 @@ typedef struct RTSPStream {
} RTSPStream; } RTSPStream;
void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf, void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
RTSPState *rt); RTSPState *rt, const char *method);
extern int rtsp_rtp_port_min; extern int rtsp_rtp_port_min;
extern int rtsp_rtp_port_max; extern int rtsp_rtp_port_max;