external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

merge from srs2

Browse source
This commit is contained in:
winlin 2016-01-05 16:58:21 +08:00
commit 5338f21439
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/src/app/srs_app_config.cpp
View file

@ -55,6 +55,9 @@ using namespace std;
using namespace _srs_internal; 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" #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. // 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. // first hello message.
srs_trace(RTMP_SIG_SRS_SERVER); srs_trace(_srs_version);
if (config_file.empty()) { if (config_file.empty()) {
ret = ERROR_SYSTEM_CONFIG_INVALID; ret = ERROR_SYSTEM_CONFIG_INVALID;

2
trunk/src/main/srs_main_server.cpp
View file

@ -58,6 +58,8 @@ ISrsThreadContext* _srs_context = new SrsThreadContext();
// app module. // app module.
SrsConfig* _srs_config = new SrsConfig(); SrsConfig* _srs_config = new SrsConfig();
SrsServer* _srs_server = new SrsServer(); 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. * show the features by macro, the actual macro values.