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-15 08:15:04 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d349a3dbda5b2566c822f569c8f27a0fb8593f8a
d349a3db
1 parent
636bc574
update stable version check
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
9 行增加
和
5 行删除
README.md
trunk/src/core/srs_core.hpp
trunk/src/main/srs_main_server.cpp
README.md
查看文件 @
d349a3d
...
...
@@ -205,7 +205,7 @@ PRIMARY response in NetConnection.connect and metadata.
newbie questions, and generally make SRS that much better.
About all PRIMARY, AUTHORS and CONTRIBUTORS, read
[
AUTHORS.txt
](
https://github.com/winlinvip/simple-rtmp-server/blob/
master
/AUTHORS.txt
)
.
[
AUTHORS.txt
](
https://github.com/winlinvip/simple-rtmp-server/blob/
develop
/AUTHORS.txt
)
.
A big THANK YOU goes to:
*
[
chnvideo
](
chnvideo.com
)
co-founders(
[
wiseyoung
](
mailto:wiseyoung@chnvideo.com
)
,
[
trueice
](
mailto:trueice@chnvideo.com
)
,
[
leijian
](
mailto:leijian@chnvideo.com
)
) for
[
big supports
](
https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#bigthanks
)
.
...
...
trunk/src/core/srs_core.hpp
查看文件 @
d349a3d
...
...
@@ -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 14
0
#define VERSION_REVISION 14
1
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
@@ -53,6 +53,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define RTMP_SIG_SRS_VERSION __SRS_XSTR(VERSION_MAJOR)"."__SRS_XSTR(VERSION_MINOR)"."__SRS_XSTR(VERSION_REVISION)
#define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY"/"RTMP_SIG_SRS_VERSION"("RTMP_SIG_SRS_CODE")"
// stable major version
#define VERSION_STABLE 1
#define VERSION_STABLE_BRANCH __SRS_XSTR(VERSION_STABLE)".0release"
// internal macros, covert macro values to str,
// see: read https://gcc.gnu.org/onlinedocs/cpp/Stringification.html#Stringification
#define __SRS_XSTR(v) __SRS_STR(v)
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
d349a3d
...
...
@@ -207,9 +207,9 @@ void check_macro_features()
srs_trace
(
"writev limits write %d iovs a time"
,
sysconf
(
_SC_IOV_MAX
));
#if VERSION_MAJOR > 1
#warning "using develop SRS, please use release instead."
srs_warn
(
"SRS %s is develop branch, please use %s instead"
,
RTMP_SIG_SRS_VERSION
,
RTMP_SIG_SRS_RELEASE
);
#if VERSION_MAJOR > VERSION_STABLE
#warning "current branch is not stable, please use stable branch instead."
srs_warn
(
"SRS %s is not stable, please use stable branch %s instead"
,
RTMP_SIG_SRS_VERSION
,
VERSION_STABLE_BRANCH
);
#endif
#if defined(SRS_AUTO_STREAM_CASTER)
...
...
请
注册
或
登录
后发表评论