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-02-17 21:01:44 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ccc30c70c4b866ea017d9f83f8b7202994434f05
ccc30c70
1 parent
9a7696a7
the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
5 行增加
和
2 行删除
README.md
trunk/src/app/srs_app_thread.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
ccc30c7
...
...
@@ -388,6 +388,7 @@ Supported operating systems and hardware:
## History
*
v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
*
<strong>
v1.0, 2015-02-12,
[
1.0r2 release(1.0.27)
](
https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2
)
released. 59507 lines.
</strong>
*
v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27.
*
v1.0, 2015-02-10, for
[
#310
](
https://github.com/winlinvip/simple-rtmp-server/issues/310
)
, the aac profile must be object plus one. 1.0.26
...
...
trunk/src/app/srs_app_thread.cpp
查看文件 @
ccc30c7
...
...
@@ -120,7 +120,9 @@ void SrsThread::stop()
st_thread_interrupt
(
tid
);
// wait the thread to exit.
st_thread_join
(
tid
,
NULL
);
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
);
tid
=
NULL
;
}
...
...
trunk/src/core/srs_core.hpp
查看文件 @
ccc30c7
...
...
@@ -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
7
#define VERSION_REVISION 2
8
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论