RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cosmetics: Reindent/align/wrap 

Originally committed as revision 23498 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-06-05 19:49:55 +00:00
parent d0382374b7
commit fc490fcf71
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavformat/rtsp.c
View File

@ -1002,10 +1002,10 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
}
int ff_rtsp_send_cmd_with_content_async(AVFormatContext *s,
const char *method, const char *url,
const char *headers,
const unsigned char *send_content,
int send_content_length)
const char *method, const char *url,
const char *headers,
const unsigned char *send_content,
int send_content_length)
{
RTSPState *rt = s->priv_data;
char buf[4096];
@ -1041,26 +1041,26 @@ int ff_rtsp_send_cmd_with_content_async(AVFormatContext *s,
}
int ff_rtsp_send_cmd_async(AVFormatContext *s, const char *method,
const char *url, const char *headers)
const char *url, const char *headers)
{
return ff_rtsp_send_cmd_with_content_async(s, method, url, headers, NULL, 0);
}
int ff_rtsp_send_cmd(AVFormatContext *s, const char *method, const char *url,
const char *headers, RTSPMessageHeader *reply,
unsigned char **content_ptr)
const char *headers, RTSPMessageHeader *reply,
unsigned char **content_ptr)
{
return ff_rtsp_send_cmd_with_content(s, method, url, headers, reply,
content_ptr, NULL, 0);
content_ptr, NULL, 0);
}
int ff_rtsp_send_cmd_with_content(AVFormatContext *s,
const char *method, const char *url,
const char *header,
RTSPMessageHeader *reply,
unsigned char **content_ptr,
const unsigned char *send_content,
int send_content_length)
const char *method, const char *url,
const char *header,
RTSPMessageHeader *reply,
unsigned char **content_ptr,
const unsigned char *send_content,
int send_content_length)
{
RTSPState *rt = s->priv_data;
HTTPAuthType cur_auth_type;
@ -1069,7 +1069,8 @@ int ff_rtsp_send_cmd_with_content(AVFormatContext *s,
retry:
cur_auth_type = rt->auth_state.auth_type;
if ((ret = ff_rtsp_send_cmd_with_content_async(s, method, url, header,
send_content, send_content_length)))
send_content,
send_content_length)))
return ret;
if ((ret = ff_rtsp_read_reply(s, reply, content_ptr, 0) ) < 0)

26
libavformat/rtsp.h
View File

@ -349,17 +349,17 @@ extern int rtsp_rtp_port_max;
* @return zero if success, nonzero otherwise
*/
int ff_rtsp_send_cmd_with_content_async(AVFormatContext *s,
const char *method, const char *url,
const char *headers,
const unsigned char *send_content,
int send_content_length);
const char *method, const char *url,
const char *headers,
const unsigned char *send_content,
int send_content_length);
/**
* Send a command to the RTSP server without waiting for the reply.
*
* @see rtsp_send_cmd_with_content_async
*/
int ff_rtsp_send_cmd_async(AVFormatContext *s, const char *method,
const char *url, const char *headers);
const char *url, const char *headers);
/**
* Send a command to the RTSP server and wait for the reply.
@ -378,12 +378,12 @@ int ff_rtsp_send_cmd_async(AVFormatContext *s, const char *method,
* @return zero if success, nonzero otherwise
*/
int ff_rtsp_send_cmd_with_content(AVFormatContext *s,
const char *method, const char *url,
const char *headers,
RTSPMessageHeader *reply,
unsigned char **content_ptr,
const unsigned char *send_content,
int send_content_length);
const char *method, const char *url,
const char *headers,
RTSPMessageHeader *reply,
unsigned char **content_ptr,
const unsigned char *send_content,
int send_content_length);
/**
* Send a command to the RTSP server and wait for the reply.
@ -391,8 +391,8 @@ int ff_rtsp_send_cmd_with_content(AVFormatContext *s,
* @see rtsp_send_cmd_with_content
*/
int ff_rtsp_send_cmd(AVFormatContext *s, const char *method,
const char *url, const char *headers,
RTSPMessageHeader *reply, unsigned char **content_ptr);
const char *url, const char *headers,
RTSPMessageHeader *reply, unsigned char **content_ptr);
/**
* Read a RTSP message from the server, or prepare to read data