胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
519c25a0 1 parent 636bc574

fork srs2 and start srs3. 3.0.0

内嵌 并排对比
正在显示 2 个修改的文件 包含 8 行增加 和 4 行删除
1 #Simple-RTMP-Server 1 #Simple-RTMP-Server
2 2
3 -SRS/2.0，开发代号：[ZhouGuowen](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#release20) 3 +SRS/3.0，开发代号：[OuXuli](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#release30)
4 4
5 SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。 5 SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。
6 6
@@ -569,6 +569,10 @@ Supported operating systems and hardware: @@ -569,6 +569,10 @@ Supported operating systems and hardware:
569 569
570 ## History 570 ## History
571 571
  572 +## SRS 3.0 history
  573 +
  574 +* v3.0, 2015-03-15, fork srs2 and start srs3. 3.0.0
  575 +
572 ### SRS 2.0 history 576 ### SRS 2.0 history
573 577
574 * v2.0, 2015-03-15, start [2.0release branch](https://github.com/winlinvip/simple-rtmp-server/tree/2.0release), 80773 lines. 578 * v2.0, 2015-03-15, start [2.0release branch](https://github.com/winlinvip/simple-rtmp-server/tree/2.0release), 80773 lines.
@@ -29,13 +29,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -29,13 +29,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
29 */ 29 */
30 30
31 // current release version 31 // current release version
32 -#define VERSION_MAJOR 2 32 +#define VERSION_MAJOR 3
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 140 34 +#define VERSION_REVISION 0
35 35
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"
38 -#define RTMP_SIG_SRS_CODE "ZhouGuowen" 38 +#define RTMP_SIG_SRS_CODE "OuXuli"
39 #define RTMP_SIG_SRS_ROLE "origin/edge server" 39 #define RTMP_SIG_SRS_ROLE "origin/edge server"
40 #define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)" 40 #define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)"
41 #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server" 41 #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"