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
2013-11-30 23:15:13 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
601a69aa70dd50fdb2a883653a3d2ce12378a28d
601a69aa
1 parent
52e6115f
update readme
显示空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
3 行增加
和
0 行删除
trunk/src/core/srs_core_encoder.cpp
trunk/src/core/srs_core_encoder.cpp
100644 → 100755
查看文件 @
601a69a
...
...
@@ -216,6 +216,7 @@ int SrsFFMPEG::start()
char
s_achannels
[
10
];
snprintf
(
s_achannels
,
sizeof
(
s_achannels
),
"%d"
,
achannels
);
// TODO: execl donot support the params.
// video params
std
::
string
s_vpreset
=
vpreset
;
if
(
!
vparams
.
empty
())
{
...
...
@@ -229,6 +230,7 @@ int SrsFFMPEG::start()
s_aparams
+=
aparams
;
}
// TODO: fork or vfork?
if
((
pid
=
fork
())
<
0
)
{
ret
=
ERROR_ENCODER_FORK
;
srs_error
(
"vfork process failed. ret=%d"
,
ret
);
...
...
@@ -237,6 +239,7 @@ int SrsFFMPEG::start()
// child process: ffmpeg encoder engine.
if
(
pid
==
0
)
{
// TODO: execl or execlp
ret
=
execl
(
ffmpeg
.
c_str
(),
ffmpeg
.
c_str
(),
"-f"
,
"flv"
,
...
...
请
注册
或
登录
后发表评论