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-03-10 14:35:20 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
6d64e38656ba7df416d8f3035109865ee8e82d40
6d64e386
1 parent
ccc30c70
warning when join thread failed. 1.0.29
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
4 行增加
和
2 行删除
trunk/src/app/srs_app_thread.cpp
trunk/src/core/srs_core.hpp
trunk/src/app/srs_app_thread.cpp
查看文件 @
6d64e38
...
...
@@ -122,7 +122,9 @@ void SrsThread::stop()
// wait the thread to exit.
int
ret
=
st_thread_join
(
tid
,
NULL
);
// TODO: FIXME: the join maybe failed, should use a variable to ensure thread terminated.
srs_assert
(
ret
==
0
);
if
(
ret
!=
0
)
{
srs_warn
(
"join thread failed. code=%d"
,
ret
);
}
tid
=
NULL
;
}
...
...
trunk/src/core/srs_core.hpp
查看文件 @
6d64e38
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REVISION 2
8
#define VERSION_REVISION 2
9
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论