Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
fc490fcf
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fc490fcf
编写于
6月 05, 2010
作者:
M
Martin Storsjö
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cosmetics: Reindent/align/wrap
Originally committed as revision 23498 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
d0382374
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
28 deletion
+29
-28
libavformat/rtsp.c
libavformat/rtsp.c
+16
-15
libavformat/rtsp.h
libavformat/rtsp.h
+13
-13
未找到文件。
libavformat/rtsp.c
浏览文件 @
fc490fcf
...
@@ -1002,10 +1002,10 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
...
@@ -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,
...
@@ -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,
...
@@ -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
)
...
...
libavformat/rtsp.h
浏览文件 @
fc490fcf
...
@@ -349,17 +349,17 @@ extern int rtsp_rtp_port_max;
...
@@ -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,
...
@@ -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,
...
@@ -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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录