胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
a993462f 1 parent 56f014ec

merge from srs1.0

内嵌 并排对比
正在显示 1 个修改的文件 包含 7 行增加 和 2 行删除
@@ -4,12 +4,13 @@ SRS/2.0，开发代号：[ZhouGuowen](https://github.com/simple-rtmp-server/srs/ @@ -4,12 +4,13 @@ SRS/2.0，开发代号：[ZhouGuowen](https://github.com/simple-rtmp-server/srs/
4 4
5 SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。 5 SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。
6 6
  7 +<<<<<<< HEAD
7 Download from github.io: 8 Download from github.io:
8 -[Centos6-x86_64](http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.27.zip) 9 +[Centos6-x86_64](http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.32.zip)
9 [more...](http://winlinvip.github.io/srs.release/releases/) 10 [more...](http://winlinvip.github.io/srs.release/releases/)
10 11
11 Download from ossrs.net: 12 Download from ossrs.net:
12 -[Centos6-x86_64](http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.27.zip) 13 +[Centos6-x86_64](http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.32.zip)
13 [more...](http://www.ossrs.net/srs.release/releases/) 14 [more...](http://www.ossrs.net/srs.release/releases/)
14 15
15 Contact by QQ or Skype, read [Contact](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Contact) 16 Contact by QQ or Skype, read [Contact](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Contact)
@@ -536,6 +537,9 @@ Supported operating systems and hardware: @@ -536,6 +537,9 @@ Supported operating systems and hardware:
536 1. [no-plan] Support file source, transcoding file to live stream 537 1. [no-plan] Support file source, transcoding file to live stream
537 538
538 ## Releases 539 ## Releases
  540 +
  541 +* 2015-05-23, [Release v1.0r4](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4), bug fixed, 1.0.32, 59509 lines.<br/>
  542 +* 2015-03-19, [Release v1.0r3](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r3), bug fixed, 1.0.30, 59511 lines.<br/>
539 * 2015-02-12, [Release v1.0r2](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r2), bug fixed, 1.0.27, 59507 lines.<br/> 543 * 2015-02-12, [Release v1.0r2](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r2), bug fixed, 1.0.27, 59507 lines.<br/>
540 * 2015-01-15, [Release v1.0r1](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r1), bug fixed, 1.0.21, 59472 lines.<br/> 544 * 2015-01-15, [Release v1.0r1](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r1), bug fixed, 1.0.21, 59472 lines.<br/>
541 * 2014-12-05, [Release v1.0r0](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r0), all bug fixed, 1.0.10, 59391 lines.<br/> 545 * 2014-12-05, [Release v1.0r0](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r0), all bug fixed, 1.0.10, 59391 lines.<br/>
@@ -675,6 +679,7 @@ Supported operating systems and hardware: @@ -675,6 +679,7 @@ Supported operating systems and hardware:
675 679
676 ### SRS 1.0 history 680 ### SRS 1.0 history
677 681
  682 +* <strong>v1.0, 2015-05-23, [1.0r4 release(1.0.32)](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4) released. 59509 lines.</strong>
678 * v1.0, 2015-05-22, fix [#397](https://github.com/simple-rtmp-server/srs/issues/397) the USER_HZ maybe not 100. 1.0.32 683 * v1.0, 2015-05-22, fix [#397](https://github.com/simple-rtmp-server/srs/issues/397) the USER_HZ maybe not 100. 1.0.32
679 * v1.0, 2015-03-26, fix hls aac adts bug, in aac mux. 1.0.31. 684 * v1.0, 2015-03-26, fix hls aac adts bug, in aac mux. 1.0.31.
680 * <strong>v1.0, 2015-03-19, [1.0r3 release(1.0.30)](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r3) released. 59511 lines.</strong> 685 * <strong>v1.0, 2015-03-19, [1.0r3 release(1.0.30)](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r3) released. 59511 lines.</strong>