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:49:27 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
8155e97b843066747eb77ed291f36717debadf42
8155e97b
1 parent
dc38ae16
add keyword XCORE for coredump to identify the version. 2.0.207
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
8 行增加
和
2 行删除
README.md
trunk/src/app/srs_app_config.cpp
trunk/src/core/srs_core.hpp
trunk/src/main/srs_main_server.cpp
README.md
查看文件 @
8155e97
...
...
@@ -338,6 +338,7 @@ Remark:
## History
*
v2.0, 2016-01-05, add keyword XCORE for coredump to identify the version. 2.0.207
*
<strong>
v2.0, 2015-12-23,
[
2.0 alpha3(2.0.205)
][
r2.0a3
]
released. 89544 lines.
</strong>
*
v2.0, 2015-12-22, for
[
#509
][
bug #509
]
always alloc big object at heap. 2.0.205
*
v2.0, 2015-12-22, for
[
#418
][
bug #418
]
ignore null connect props to make RED5 happy. 2.0.204
...
...
trunk/src/app/srs_app_config.cpp
查看文件 @
8155e97
...
...
@@ -49,6 +49,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.
...
...
@@ -1360,7 +1363,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/core/srs_core.hpp
查看文件 @
8155e97
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 20
6
#define VERSION_REVISION 20
7
// generated by configure, only macros.
#include <srs_auto_headers.hpp>
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
8155e97
...
...
@@ -54,6 +54,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.
...
...
请
注册
或
登录
后发表评论