diff options
author | Martin Storsjö <martin@martin.st> | 2010-02-22 19:44:08 +0000 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2010-02-22 19:44:08 +0000 |
commit | 15ba23150eff85095d484be5e66031cff5d2519c (patch) | |
tree | 28790650865df5a96a829133e48f993e952e67b5 /libavformat/rtsp.c | |
parent | 2efc97c2fe2c9d4293fb2706b8974ae3849b9e4d (diff) | |
download | ffmpeg-15ba23150eff85095d484be5e66031cff5d2519c.tar.gz |
Add declarations and doxygen documentation of generic rtsp support functions
to rtsp.h, and make the functions non-static
Originally committed as revision 21968 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtsp.c')
-rw-r--r-- | libavformat/rtsp.c | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 67571a9ba7..2e2b6c8058 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -572,7 +572,7 @@ static int sdp_parse(AVFormatContext *s, const char *content) } /* close and free RTSP streams */ -static void rtsp_close_streams(AVFormatContext *s) +void rtsp_close_streams(AVFormatContext *s) { RTSPState *rt = s->priv_data; int i; @@ -879,28 +879,7 @@ static void rtsp_skip_packet(AVFormatContext *s) } } -/** - * Read a RTSP message from the server, or prepare to read data - * packets if we're reading data interleaved over the TCP/RTSP - * connection as well. - * - * @param s RTSP demuxer context - * @param reply pointer where the RTSP message header will be stored - * @param content_ptr pointer where the RTSP message body, if any, will - * be stored (length is in reply) - * @param return_on_interleaved_data whether the function may return if we - * encounter a data marker ('$'), which precedes data - * packets over interleaved TCP/RTSP connections. If this - * is set, this function will return 1 after encountering - * a '$'. If it is not set, the function will skip any - * data packets (if they are encountered), until a reply - * has been fully parsed. If no more data is available - * without parsing a reply, it will return an error. - * - * @returns 1 if a data packets is ready to be received, -1 on error, - * and 0 on success. - */ -static int rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, +int rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, unsigned char **content_ptr, int return_on_interleaved_data) { @@ -987,7 +966,7 @@ static int rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, return 0; } -static void rtsp_send_cmd_with_content_async(AVFormatContext *s, +void rtsp_send_cmd_with_content_async(AVFormatContext *s, const char *cmd, const unsigned char *send_content, int send_content_length) @@ -1019,12 +998,12 @@ static void rtsp_send_cmd_with_content_async(AVFormatContext *s, rt->last_cmd_time = av_gettime(); } -static void rtsp_send_cmd_async(AVFormatContext *s, const char *cmd) +void rtsp_send_cmd_async(AVFormatContext *s, const char *cmd) { rtsp_send_cmd_with_content_async(s, cmd, NULL, 0); } -static void rtsp_send_cmd(AVFormatContext *s, +void rtsp_send_cmd(AVFormatContext *s, const char *cmd, RTSPMessageHeader *reply, unsigned char **content_ptr) { @@ -1033,7 +1012,7 @@ static void rtsp_send_cmd(AVFormatContext *s, rtsp_read_reply(s, reply, content_ptr, 0); } -static void rtsp_send_cmd_with_content(AVFormatContext *s, +void rtsp_send_cmd_with_content(AVFormatContext *s, const char *cmd, RTSPMessageHeader *reply, unsigned char **content_ptr, @@ -1397,7 +1376,7 @@ static int rtsp_setup_output_streams(AVFormatContext *s) return 0; } -static int rtsp_connect(AVFormatContext *s) +int rtsp_connect(AVFormatContext *s) { RTSPState *rt = s->priv_data; char host[1024], path[1024], tcpname[1024], cmd[2048], auth[128]; |