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
2016-01-05 16:58:21 +0800
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
5338f21439beddc77a9fc447af947f258fade624
5338f214
2 parents
e150fb3f
8155e97b
merge from srs2
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
6 行增加
和
1 行删除
trunk/src/app/srs_app_config.cpp
trunk/src/main/srs_main_server.cpp
trunk/src/app/srs_app_config.cpp
查看文件 @
5338f21
...
...
@@ -55,6 +55,9 @@ using namespace std;
using
namespace
_srs_internal
;
// the version to identify the core.
const
char
*
_srs_version
=
"XCORE-"
RTMP_SIG_SRS_SERVER
;
#define SRS_WIKI_URL_LOG "https://github.com/ossrs/srs/wiki/v1_CN_SrsLog"
// when user config an invalid value, macros to perfer true or false.
...
...
@@ -1930,7 +1933,7 @@ int SrsConfig::parse_options(int argc, char** argv)
}
// first hello message.
srs_trace
(
RTMP_SIG_SRS_SERVER
);
srs_trace
(
_srs_version
);
if
(
config_file
.
empty
())
{
ret
=
ERROR_SYSTEM_CONFIG_INVALID
;
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
5338f21
...
...
@@ -58,6 +58,8 @@ ISrsThreadContext* _srs_context = new SrsThreadContext();
// app module.
SrsConfig
*
_srs_config
=
new
SrsConfig
();
SrsServer
*
_srs_server
=
new
SrsServer
();
// version of srs, which can grep keyword "XCORE"
extern
const
char
*
_srs_version
;
/**
* show the features by macro, the actual macro values.
...
...
请
注册
或
登录
后发表评论