Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Williams <mike@mikebwilliams.com>2011-05-18 17:14:22 +0400
committerAnton Khirnov <anton@khirnov.net>2011-05-26 22:05:48 +0400
commite2d7dc87df0c1e261e4a3fe082d192a7a798d4d5 (patch)
treee479860525716549f8a415dc94312754ef6bbf6d /ffserver.c
parent9749cdf7754e600ff50dc255519fdb7bb5aad800 (diff)
ffserver: move close_connection() call to avoid a temporary string and copy.
Signed-off-by: Mike Williams <mike@mikebwilliams.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/ffserver.c b/ffserver.c
index b95a854363..56bcba58f7 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3274,7 +3274,6 @@ static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h
static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader *h)
{
HTTPContext *rtp_c;
- char session_id[32];
rtp_c = find_rtp_session_with_url(url, h->session_id);
if (!rtp_c) {
@@ -3282,16 +3281,14 @@ static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader
return;
}
- av_strlcpy(session_id, rtp_c->session_id, sizeof(session_id));
-
- /* abort the session */
- close_connection(rtp_c);
-
/* now everything is OK, so we can send the connection parameters */
rtsp_reply_header(c, RTSP_STATUS_OK);
/* session ID */
- avio_printf(c->pb, "Session: %s\r\n", session_id);
+ avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
avio_printf(c->pb, "\r\n");
+
+ /* abort the session */
+ close_connection(rtp_c);
}