Commit 5d3a8954 authored by rbultje's avatar rbultje

Remove reply and content_ptr arguments from rtsp_send_cmd_async(), since

they are unused.



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21371 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 4426b658
...@@ -929,9 +929,7 @@ static int rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, ...@@ -929,9 +929,7 @@ static int rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
return 0; return 0;
} }
static void rtsp_send_cmd_async(AVFormatContext *s, static void rtsp_send_cmd_async(AVFormatContext *s, const char *cmd)
const char *cmd, RTSPMessageHeader *reply,
unsigned char **content_ptr)
{ {
RTSPState *rt = s->priv_data; RTSPState *rt = s->priv_data;
char buf[4096], buf1[1024]; char buf[4096], buf1[1024];
...@@ -960,7 +958,7 @@ static void rtsp_send_cmd(AVFormatContext *s, ...@@ -960,7 +958,7 @@ static void rtsp_send_cmd(AVFormatContext *s,
const char *cmd, RTSPMessageHeader *reply, const char *cmd, RTSPMessageHeader *reply,
unsigned char **content_ptr) unsigned char **content_ptr)
{ {
rtsp_send_cmd_async(s, cmd, reply, content_ptr); rtsp_send_cmd_async(s, cmd);
rtsp_read_reply(s, reply, content_ptr, 0); rtsp_read_reply(s, reply, content_ptr, 0);
} }
...@@ -1651,10 +1649,9 @@ static int rtsp_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -1651,10 +1649,9 @@ static int rtsp_read_packet(AVFormatContext *s, AVPacket *pkt)
snprintf(cmd, sizeof(cmd) - 1, snprintf(cmd, sizeof(cmd) - 1,
"GET_PARAMETER %s RTSP/1.0\r\n", "GET_PARAMETER %s RTSP/1.0\r\n",
s->filename); s->filename);
rtsp_send_cmd_async(s, cmd, reply, NULL); rtsp_send_cmd_async(s, cmd);
} else { } else {
rtsp_send_cmd_async(s, "OPTIONS * RTSP/1.0\r\n", rtsp_send_cmd_async(s, "OPTIONS * RTSP/1.0\r\n");
reply, NULL);
} }
} }
...@@ -1714,7 +1711,6 @@ static int rtsp_read_seek(AVFormatContext *s, int stream_index, ...@@ -1714,7 +1711,6 @@ static int rtsp_read_seek(AVFormatContext *s, int stream_index,
static int rtsp_read_close(AVFormatContext *s) static int rtsp_read_close(AVFormatContext *s)
{ {
RTSPState *rt = s->priv_data; RTSPState *rt = s->priv_data;
RTSPMessageHeader reply1, *reply = &reply1;
char cmd[1024]; char cmd[1024];
#if 0 #if 0
...@@ -1726,7 +1722,7 @@ static int rtsp_read_close(AVFormatContext *s) ...@@ -1726,7 +1722,7 @@ static int rtsp_read_close(AVFormatContext *s)
snprintf(cmd, sizeof(cmd), snprintf(cmd, sizeof(cmd),
"TEARDOWN %s RTSP/1.0\r\n", "TEARDOWN %s RTSP/1.0\r\n",
s->filename); s->filename);
rtsp_send_cmd_async(s, cmd, reply, NULL); rtsp_send_cmd_async(s, cmd);
rtsp_close_streams(rt); rtsp_close_streams(rt);
url_close(rt->rtsp_hd); url_close(rt->rtsp_hd);
......
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