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-11-02 13:37:44 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
4b5eb5ea2d26c8fbd6ad3f5fef4ef9ec0d13495d
4b5eb5ea
1 parent
e3407c1d
fix the parse rtmp url bug for ingest.
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
8 行增加
和
4 行删除
trunk/src/app/srs_app_ingest.cpp
trunk/src/app/srs_app_process.cpp
trunk/src/app/srs_app_ingest.cpp
查看文件 @
4b5eb5e
...
...
@@ -356,10 +356,11 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
// find the app and stream in rtmp url
std
::
string
app
,
stream
;
srs_parse_rtmp_url
(
output
,
app
,
stream
);
size_t
pos
;
if
((
pos
=
app
.
rfind
(
"?"
))
!=
std
::
string
::
npos
)
{
app
=
app
.
substr
(
0
,
pos
);
if
(
true
)
{
int
port
=
SRS_CONSTS_RTMP_DEFAULT_PORT
;
std
::
string
tcUrl
,
schema
,
host
,
vhost2
,
param
;
srs_parse_rtmp_url
(
output
,
tcUrl
,
stream
);
srs_discovery_tc_url
(
tcUrl
,
schema
,
host
,
vhost2
,
app
,
port
,
param
);
}
std
::
string
log_file
=
SRS_CONSTS_NULL_FILE
;
// disabled
...
...
trunk/src/app/srs_app_process.cpp
查看文件 @
4b5eb5e
...
...
@@ -122,6 +122,9 @@ int SrsProcess::start()
return
ret
;
}
// for osx(lldb) to debug the child process.
//kill(0, SIGSTOP);
// child process: ffmpeg encoder engine.
if
(
pid
==
0
)
{
// ignore the SIGINT and SIGTERM
...
...
请
注册
或
登录
后发表评论