mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Use rt->control_uri consequently instead of s->filename in all RTSP commands
Originally committed as revision 22403 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
28e5130b5f
commit
db76ca7f35
@ -1300,7 +1300,7 @@ static int rtsp_setup_input_streams(AVFormatContext *s)
|
||||
snprintf(cmd, sizeof(cmd),
|
||||
"DESCRIBE %s RTSP/1.0\r\n"
|
||||
"Accept: application/sdp\r\n",
|
||||
s->filename);
|
||||
rt->control_uri);
|
||||
if (rt->server_type == RTSP_SERVER_REAL) {
|
||||
/**
|
||||
* The Require: attribute is needed for proper streaming from
|
||||
@ -1339,7 +1339,7 @@ static int rtsp_setup_output_streams(AVFormatContext *s)
|
||||
snprintf(cmd, sizeof(cmd),
|
||||
"ANNOUNCE %s RTSP/1.0\r\n"
|
||||
"Content-Type: application/sdp\r\n",
|
||||
s->filename);
|
||||
rt->control_uri);
|
||||
sdp = av_mallocz(8192);
|
||||
if (sdp == NULL)
|
||||
return AVERROR(ENOMEM);
|
||||
@ -1366,7 +1366,7 @@ static int rtsp_setup_output_streams(AVFormatContext *s)
|
||||
st->priv_data = rtsp_st;
|
||||
rtsp_st->stream_index = i;
|
||||
|
||||
av_strlcpy(rtsp_st->control_url, s->filename, sizeof(rtsp_st->control_url));
|
||||
av_strlcpy(rtsp_st->control_url, rt->control_uri, sizeof(rtsp_st->control_url));
|
||||
/* Note, this must match the relative uri set in the sdp content */
|
||||
av_strlcatf(rtsp_st->control_url, sizeof(rtsp_st->control_url),
|
||||
"/streamid=%d", i);
|
||||
@ -1469,7 +1469,7 @@ redirect:
|
||||
sizeof(rt->control_uri));
|
||||
for (rt->server_type = RTSP_SERVER_RTP;;) {
|
||||
snprintf(cmd, sizeof(cmd),
|
||||
"OPTIONS %s RTSP/1.0\r\n", s->filename);
|
||||
"OPTIONS %s RTSP/1.0\r\n", rt->control_uri);
|
||||
if (rt->server_type == RTSP_SERVER_REAL)
|
||||
av_strlcat(cmd,
|
||||
/**
|
||||
@ -1890,7 +1890,7 @@ static int rtsp_read_close(AVFormatContext *s)
|
||||
#endif
|
||||
snprintf(cmd, sizeof(cmd),
|
||||
"TEARDOWN %s RTSP/1.0\r\n",
|
||||
s->filename);
|
||||
rt->control_uri);
|
||||
ff_rtsp_send_cmd_async(s, cmd);
|
||||
|
||||
ff_rtsp_close_streams(s);
|
||||
|
@ -37,7 +37,7 @@ static int rtsp_write_record(AVFormatContext *s)
|
||||
snprintf(cmd, sizeof(cmd),
|
||||
"RECORD %s RTSP/1.0\r\n"
|
||||
"Range: npt=%0.3f-\r\n",
|
||||
s->filename,
|
||||
rt->control_uri,
|
||||
(double) 0);
|
||||
ff_rtsp_send_cmd(s, cmd, reply, NULL);
|
||||
if (reply->status_code != RTSP_STATUS_OK)
|
||||
@ -111,7 +111,7 @@ static int rtsp_write_close(AVFormatContext *s)
|
||||
|
||||
snprintf(cmd, sizeof(cmd),
|
||||
"TEARDOWN %s RTSP/1.0\r\n",
|
||||
s->filename);
|
||||
rt->control_uri);
|
||||
ff_rtsp_send_cmd_async(s, cmd);
|
||||
|
||||
ff_rtsp_close_streams(s);
|
||||
|
Loading…
Reference in New Issue
Block a user