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
2014-11-06 15:18:45 +0800
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
76d5914d7c7be742da0856217598294aa4cf17e6
76d5914d
2 parents
c99b5592
5fd308c6
Merge branch 'srs.master'
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
2 行增加
和
3 行删除
trunk/research/st/srs.c
trunk/src/main/srs_main_server.cpp
trunk/research/st/srs.c
查看文件 @
76d5914
...
...
@@ -11,10 +11,8 @@
#include "public.h"
#if
!
defined(__ia64__)
#if defined(__ia64__)
#error "IA64 not supported"
#else
#error "Only IA64 supported"
#endif
#define srs_trace(msg, ...) printf(msg, ##__VA_ARGS__);printf("\n")
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
76d5914
...
...
@@ -140,6 +140,7 @@ void check_macro_features()
#endif
#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
);
#endif
}
...
...
请
注册
或
登录
后发表评论