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-12-06 14:07:37 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
71895a4da6979081565b8976a00756b7ffd25bff
71895a4d
1 parent
cab88dfe
fix the ffmpeg kill bug, wait until ffmpeg quit.
显示空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
5 行增加
和
1 行删除
trunk/src/core/srs_core_encoder.cpp
trunk/src/core/srs_core_encoder.cpp
100644 → 100755
查看文件 @
71895a4
...
...
@@ -448,8 +448,12 @@ void SrsFFMPEG::stop()
srs_warn
(
"kill the encoder failed, ignored. pid=%d"
,
pid
);
}
// wait for the ffmpeg to quit.
// ffmpeg will gracefully quit if signal is:
// 1) SIGHUP 2) SIGINT 3) SIGQUIT
// other signals, directly exit(123).
int
status
=
0
;
if
(
waitpid
(
pid
,
&
status
,
WNOHANG
)
<
0
)
{
if
(
waitpid
(
pid
,
&
status
,
0
)
<
0
)
{
srs_warn
(
"wait the encoder quit failed, ignored. pid=%d"
,
pid
);
}
...
...
请
注册
或
登录
后发表评论