summaryrefslogtreecommitdiff
path: root/libavformat/rtsp.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2009-02-21 22:26:44 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2009-02-21 22:26:44 +0000
commita9e534d56128971af55b44d38381461a56aa23a3 (patch)
tree5e1144426cc743a9fcee96c40bc23fe6739f971f /libavformat/rtsp.c
parentb1598b5805c1f05004d2c3114d2abeafc93ae716 (diff)
Rename RTSPHeader to RTSPMessageHeader to reflect more clearly what the
structure is meant to represent. See "[PATCH] rtsp.[ch]: RTSPHeader -> RTSPServerResponse" and "[PATCH] document rtsp.h" threads on ML. Originally committed as revision 17504 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtsp.c')
-rw-r--r--libavformat/rtsp.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index d991a9de72..a7bd0199ff 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -570,7 +570,7 @@ static void rtsp_parse_range(int *min_ptr, int *max_ptr, const char **pp)
}
/* XXX: only one transport specification is parsed */
-static void rtsp_parse_transport(RTSPHeader *reply, const char *p)
+static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p)
{
char transport_protocol[16];
char profile[16];
@@ -672,7 +672,7 @@ static void rtsp_parse_transport(RTSPHeader *reply, const char *p)
}
}
-void rtsp_parse_line(RTSPHeader *reply, const char *buf)
+void rtsp_parse_line(RTSPMessageHeader *reply, const char *buf)
{
const char *p;
@@ -738,7 +738,7 @@ static void rtsp_skip_packet(AVFormatContext *s)
}
static void rtsp_send_cmd(AVFormatContext *s,
- const char *cmd, RTSPHeader *reply,
+ const char *cmd, RTSPMessageHeader *reply,
unsigned char **content_ptr)
{
RTSPState *rt = s->priv_data;
@@ -888,7 +888,7 @@ make_setup_request (AVFormatContext *s, const char *host, int port,
RTSPState *rt = s->priv_data;
int j, i, err, interleave = 0;
RTSPStream *rtsp_st;
- RTSPHeader reply1, *reply = &reply1;
+ RTSPMessageHeader reply1, *reply = &reply1;
char cmd[2048];
const char *trans_pref;
@@ -1064,7 +1064,7 @@ static int rtsp_read_header(AVFormatContext *s,
char host[1024], path[1024], tcpname[1024], cmd[2048], *option_list, *option;
URLContext *rtsp_hd;
int port, ret, err;
- RTSPHeader reply1, *reply = &reply1;
+ RTSPMessageHeader reply1, *reply = &reply1;
unsigned char *content = NULL;
int lower_transport_mask = 0;
char real_challenge[64];
@@ -1313,7 +1313,7 @@ static int rtsp_read_packet(AVFormatContext *s,
if (rt->server_type == RTSP_SERVER_REAL) {
int i;
- RTSPHeader reply1, *reply = &reply1;
+ RTSPMessageHeader reply1, *reply = &reply1;
enum AVDiscard cache[MAX_STREAMS];
char cmd[1024];
@@ -1421,7 +1421,7 @@ static int rtsp_read_packet(AVFormatContext *s,
static int rtsp_read_play(AVFormatContext *s)
{
RTSPState *rt = s->priv_data;
- RTSPHeader reply1, *reply = &reply1;
+ RTSPMessageHeader reply1, *reply = &reply1;
char cmd[1024];
av_log(s, AV_LOG_DEBUG, "hello state=%d\n", rt->state);
@@ -1451,7 +1451,7 @@ static int rtsp_read_play(AVFormatContext *s)
static int rtsp_read_pause(AVFormatContext *s)
{
RTSPState *rt = s->priv_data;
- RTSPHeader reply1, *reply = &reply1;
+ RTSPMessageHeader reply1, *reply = &reply1;
char cmd[1024];
rt = s->priv_data;
@@ -1495,7 +1495,7 @@ static int rtsp_read_seek(AVFormatContext *s, int stream_index,
static int rtsp_read_close(AVFormatContext *s)
{
RTSPState *rt = s->priv_data;
- RTSPHeader reply1, *reply = &reply1;
+ RTSPMessageHeader reply1, *reply = &reply1;
char cmd[1024];
#if 0