From 2e13ecfecae5929d98292e5378c1671ad4adf842 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 21 Jan 2010 20:04:17 +0000 Subject: Remove reply and content_ptr arguments from rtsp_send_cmd_async(), since they are unused. Originally committed as revision 21371 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtsp.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'libavformat') diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index bbd047f0c9..1764ecf266 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -929,9 +929,7 @@ static int rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, return 0; } -static void rtsp_send_cmd_async(AVFormatContext *s, - const char *cmd, RTSPMessageHeader *reply, - unsigned char **content_ptr) +static void rtsp_send_cmd_async(AVFormatContext *s, const char *cmd) { RTSPState *rt = s->priv_data; char buf[4096], buf1[1024]; @@ -960,7 +958,7 @@ static void rtsp_send_cmd(AVFormatContext *s, const char *cmd, RTSPMessageHeader *reply, 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); } @@ -1651,10 +1649,9 @@ static int rtsp_read_packet(AVFormatContext *s, AVPacket *pkt) snprintf(cmd, sizeof(cmd) - 1, "GET_PARAMETER %s RTSP/1.0\r\n", s->filename); - rtsp_send_cmd_async(s, cmd, reply, NULL); + rtsp_send_cmd_async(s, cmd); } else { - rtsp_send_cmd_async(s, "OPTIONS * RTSP/1.0\r\n", - reply, NULL); + rtsp_send_cmd_async(s, "OPTIONS * RTSP/1.0\r\n"); } } @@ -1714,7 +1711,6 @@ static int rtsp_read_seek(AVFormatContext *s, int stream_index, static int rtsp_read_close(AVFormatContext *s) { RTSPState *rt = s->priv_data; - RTSPMessageHeader reply1, *reply = &reply1; char cmd[1024]; #if 0 @@ -1726,7 +1722,7 @@ static int rtsp_read_close(AVFormatContext *s) snprintf(cmd, sizeof(cmd), "TEARDOWN %s RTSP/1.0\r\n", s->filename); - rtsp_send_cmd_async(s, cmd, reply, NULL); + rtsp_send_cmd_async(s, cmd); rtsp_close_streams(rt); url_close(rt->rtsp_hd); -- cgit v1.2.3