胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
91e285b0 2 parents 94681702 4b372d8d

Merge branch '2.0release' into develop

内嵌 并排对比
正在显示 1 个修改的文件 包含 1 行增加 和 1 行删除
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
44 #define RTMP_SIG_SRS_EMAIL "winlin@vip.126.com" 44 #define RTMP_SIG_SRS_EMAIL "winlin@vip.126.com"
45 #define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)" 45 #define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)"
46 #define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013-2015 SRS(simple-rtmp-server)" 46 #define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013-2015 SRS(simple-rtmp-server)"
47 -#define RTMP_SIG_SRS_PRIMARY "SRS Team" 47 +#define RTMP_SIG_SRS_PRIMARY "SRS/"VERSION_STABLE_BRANCH
48 #define RTMP_SIG_SRS_AUTHROS "winlin,wenjie.zhao" 48 #define RTMP_SIG_SRS_AUTHROS "winlin,wenjie.zhao"
49 #define RTMP_SIG_SRS_CONTRIBUTORS_URL RTMP_SIG_SRS_URL"/blob/master/AUTHORS.txt" 49 #define RTMP_SIG_SRS_CONTRIBUTORS_URL RTMP_SIG_SRS_URL"/blob/master/AUTHORS.txt"
50 #define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_VERSION")" 50 #define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_VERSION")"