[SCM] libav/experimental: Remove reply and content_ptr arguments from rtsp_send_cmd_async(), since they are unused.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:58:18 UTC 2013
The following commit has been merged in the experimental branch:
commit 2e13ecfecae5929d98292e5378c1671ad4adf842
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Thu Jan 21 20:04:17 2010 +0000
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
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index bbd047f..1764ecf 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);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list