Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-01-07 13:37:23 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
89a3cf9efe105d21fd76ea10c36672445afa5237
89a3cf9e
1 parent
0e03d019
refine code, failed when specified complex but no ssl for srslibrtmp
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
10 行增加
和
5 行删除
trunk/research/librtmp/srs_rtmp_dump.c
trunk/src/libs/srs_librtmp.cpp
trunk/research/librtmp/srs_rtmp_dump.c
查看文件 @
89a3cf9
...
...
@@ -80,6 +80,9 @@ void parse_amf0_object(char* p, srs_amf0_t args)
int
main
(
int
argc
,
char
**
argv
)
{
srs_flv_t
flv
=
NULL
;
srs_rtmp_t
rtmp
=
NULL
;
printf
(
"dump rtmp stream to flv file
\n
"
);
printf
(
"srs(simple-rtmp-server) client librtmp library.
\n
"
);
printf
(
"version: %d.%d.%d
\n
"
,
srs_version_major
(),
srs_version_minor
(),
srs_version_revision
());
...
...
@@ -184,7 +187,7 @@ int main(int argc, char** argv)
srs_human_trace
(
"output to console"
);
}
srs_rtmp_t
rtmp
=
srs_rtmp_create
(
rtmp_url
);
rtmp
=
srs_rtmp_create
(
rtmp_url
);
if
(
__srs_rtmp_dns_resolve
(
rtmp
)
!=
0
)
{
srs_human_trace
(
"dns resolve failed."
);
...
...
@@ -227,7 +230,6 @@ int main(int argc, char** argv)
}
srs_human_trace
(
"play stream success"
);
srs_flv_t
flv
=
NULL
;
if
(
output_flv
)
{
flv
=
srs_flv_open_write
(
output_flv
);
}
...
...
@@ -282,9 +284,7 @@ int main(int argc, char** argv)
rtmp_destroy:
srs_rtmp_destroy
(
rtmp
);
if
(
flv
)
{
srs_flv_close
(
flv
);
}
srs_flv_close
(
flv
);
srs_human_trace
(
"completed"
);
return
0
;
...
...
trunk/src/libs/srs_librtmp.cpp
查看文件 @
89a3cf9
...
...
@@ -602,6 +602,11 @@ int __srs_rtmp_connect_server(srs_rtmp_t rtmp)
int
__srs_rtmp_do_complex_handshake
(
srs_rtmp_t
rtmp
)
{
#ifndef SRS_AUTO_SSL
// complex handshake requires ssl
return
ERROR_RTMP_HS_SSL_REQUIRE
;
#endif
int
ret
=
ERROR_SUCCESS
;
srs_assert
(
rtmp
!=
NULL
);
...
...
请
注册
或
登录
后发表评论