mirror of https://git.ffmpeg.org/ffmpeg.git
Cosmetics: Reindent/align/wrap
Originally committed as revision 23498 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
d0382374b7
commit
fc490fcf71
|
@ -1002,10 +1002,10 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
|
||||||
}
|
}
|
||||||
|
|
||||||
int ff_rtsp_send_cmd_with_content_async(AVFormatContext *s,
|
int ff_rtsp_send_cmd_with_content_async(AVFormatContext *s,
|
||||||
const char *method, const char *url,
|
const char *method, const char *url,
|
||||||
const char *headers,
|
const char *headers,
|
||||||
const unsigned char *send_content,
|
const unsigned char *send_content,
|
||||||
int send_content_length)
|
int send_content_length)
|
||||||
{
|
{
|
||||||
RTSPState *rt = s->priv_data;
|
RTSPState *rt = s->priv_data;
|
||||||
char buf[4096];
|
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,
|
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);
|
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,
|
int ff_rtsp_send_cmd(AVFormatContext *s, const char *method, const char *url,
|
||||||
const char *headers, RTSPMessageHeader *reply,
|
const char *headers, RTSPMessageHeader *reply,
|
||||||
unsigned char **content_ptr)
|
unsigned char **content_ptr)
|
||||||
{
|
{
|
||||||
return ff_rtsp_send_cmd_with_content(s, method, url, headers, reply,
|
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,
|
int ff_rtsp_send_cmd_with_content(AVFormatContext *s,
|
||||||
const char *method, const char *url,
|
const char *method, const char *url,
|
||||||
const char *header,
|
const char *header,
|
||||||
RTSPMessageHeader *reply,
|
RTSPMessageHeader *reply,
|
||||||
unsigned char **content_ptr,
|
unsigned char **content_ptr,
|
||||||
const unsigned char *send_content,
|
const unsigned char *send_content,
|
||||||
int send_content_length)
|
int send_content_length)
|
||||||
{
|
{
|
||||||
RTSPState *rt = s->priv_data;
|
RTSPState *rt = s->priv_data;
|
||||||
HTTPAuthType cur_auth_type;
|
HTTPAuthType cur_auth_type;
|
||||||
|
@ -1069,7 +1069,8 @@ int ff_rtsp_send_cmd_with_content(AVFormatContext *s,
|
||||||
retry:
|
retry:
|
||||||
cur_auth_type = rt->auth_state.auth_type;
|
cur_auth_type = rt->auth_state.auth_type;
|
||||||
if ((ret = ff_rtsp_send_cmd_with_content_async(s, method, url, header,
|
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;
|
return ret;
|
||||||
|
|
||||||
if ((ret = ff_rtsp_read_reply(s, reply, content_ptr, 0) ) < 0)
|
if ((ret = ff_rtsp_read_reply(s, reply, content_ptr, 0) ) < 0)
|
||||||
|
|
|
@ -349,17 +349,17 @@ extern int rtsp_rtp_port_max;
|
||||||
* @return zero if success, nonzero otherwise
|
* @return zero if success, nonzero otherwise
|
||||||
*/
|
*/
|
||||||
int ff_rtsp_send_cmd_with_content_async(AVFormatContext *s,
|
int ff_rtsp_send_cmd_with_content_async(AVFormatContext *s,
|
||||||
const char *method, const char *url,
|
const char *method, const char *url,
|
||||||
const char *headers,
|
const char *headers,
|
||||||
const unsigned char *send_content,
|
const unsigned char *send_content,
|
||||||
int send_content_length);
|
int send_content_length);
|
||||||
/**
|
/**
|
||||||
* Send a command to the RTSP server without waiting for the reply.
|
* Send a command to the RTSP server without waiting for the reply.
|
||||||
*
|
*
|
||||||
* @see rtsp_send_cmd_with_content_async
|
* @see rtsp_send_cmd_with_content_async
|
||||||
*/
|
*/
|
||||||
int ff_rtsp_send_cmd_async(AVFormatContext *s, const char *method,
|
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.
|
* 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
|
* @return zero if success, nonzero otherwise
|
||||||
*/
|
*/
|
||||||
int ff_rtsp_send_cmd_with_content(AVFormatContext *s,
|
int ff_rtsp_send_cmd_with_content(AVFormatContext *s,
|
||||||
const char *method, const char *url,
|
const char *method, const char *url,
|
||||||
const char *headers,
|
const char *headers,
|
||||||
RTSPMessageHeader *reply,
|
RTSPMessageHeader *reply,
|
||||||
unsigned char **content_ptr,
|
unsigned char **content_ptr,
|
||||||
const unsigned char *send_content,
|
const unsigned char *send_content,
|
||||||
int send_content_length);
|
int send_content_length);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Send a command to the RTSP server and wait for the reply.
|
* 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
|
* @see rtsp_send_cmd_with_content
|
||||||
*/
|
*/
|
||||||
int ff_rtsp_send_cmd(AVFormatContext *s, const char *method,
|
int ff_rtsp_send_cmd(AVFormatContext *s, const char *method,
|
||||||
const char *url, const char *headers,
|
const char *url, const char *headers,
|
||||||
RTSPMessageHeader *reply, unsigned char **content_ptr);
|
RTSPMessageHeader *reply, unsigned char **content_ptr);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read a RTSP message from the server, or prepare to read data
|
* Read a RTSP message from the server, or prepare to read data
|
||||||
|
|
Loading…
Reference in New Issue