正在显示
1 个修改的文件
包含
2 行增加
和
34 行删除
| 1 | #Simple-RTMP-Server | 1 | #Simple-RTMP-Server |
| 2 | 2 | ||
| 3 | -SRS/3.0, [OuXuli](https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release30) | 3 | +SRS/3.0, [OuXuli][release3] |
| 4 | 4 | ||
| 5 | SRS定位是运营级的互联网直播服务器集群,追求更好的概念完整性和最简单实现的代码。<br/> | 5 | SRS定位是运营级的互联网直播服务器集群,追求更好的概念完整性和最简单实现的代码。<br/> |
| 6 | SRS is industrial-strength live streaming cluster, for the best conceptual integrity and the simplest implementation. | 6 | SRS is industrial-strength live streaming cluster, for the best conceptual integrity and the simplest implementation. |
| @@ -342,12 +342,6 @@ Remark: | @@ -342,12 +342,6 @@ Remark: | ||
| 342 | 342 | ||
| 343 | ## History | 343 | ## History |
| 344 | 344 | ||
| 345 | -## SRS 3.0 history | ||
| 346 | - | ||
| 347 | -* v3.0, 2015-03-15, fork srs2 and start srs3. 3.0.0 | ||
| 348 | - | ||
| 349 | -### SRS 2.0 history | ||
| 350 | - | ||
| 351 | * v2.0, 2015-07-21, for [#169](https://github.com/simple-rtmp-server/srs/issues/169) support default values for transcode. 2.0.180 | 345 | * v2.0, 2015-07-21, for [#169](https://github.com/simple-rtmp-server/srs/issues/169) support default values for transcode. 2.0.180 |
| 352 | * v2.0, 2015-07-21, fix [#435](https://github.com/simple-rtmp-server/srs/issues/435) add pageUrl for HTTP callback on_play. | 346 | * v2.0, 2015-07-21, fix [#435](https://github.com/simple-rtmp-server/srs/issues/435) add pageUrl for HTTP callback on_play. |
| 353 | * v2.0, 2015-07-20, refine the hls, ignore packet when no sequence header. 2.0.179 | 347 | * v2.0, 2015-07-20, refine the hls, ignore packet when no sequence header. 2.0.179 |
| @@ -472,33 +466,6 @@ Remark: | @@ -472,33 +466,6 @@ Remark: | ||
| 472 | * v2.0, 2014-10-19, fix [#184](https://github.com/simple-rtmp-server/srs/issues/184), support AnnexB in RTMP body for HLS. 2.0.2 | 466 | * v2.0, 2014-10-19, fix [#184](https://github.com/simple-rtmp-server/srs/issues/184), support AnnexB in RTMP body for HLS. 2.0.2 |
| 473 | * v2.0, 2014-10-18, remove supports for OSX(darwin). 2.0.1. | 467 | * v2.0, 2014-10-18, remove supports for OSX(darwin). 2.0.1. |
| 474 | * v2.0, 2014-10-16, revert github srs README to English. 2.0.0. | 468 | * v2.0, 2014-10-16, revert github srs README to English. 2.0.0. |
| 475 | - | ||
| 476 | -### SRS 1.0 history | ||
| 477 | - | ||
| 478 | -* <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> | ||
| 479 | -* 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 | ||
| 480 | -* v1.0, 2015-03-26, fix hls aac adts bug, in aac mux. 1.0.31. | ||
| 481 | -* <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> | ||
| 482 | -* v1.0, 2015-03-17, remove the osx for 1.0.30. | ||
| 483 | -* v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. | ||
| 484 | -* <strong>v1.0, 2015-02-12, [1.0r2 release(1.0.27)](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r2) released. 59507 lines.</strong> | ||
| 485 | -* v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27. | ||
| 486 | -* v1.0, 2015-02-10, for [#310](https://github.com/simple-rtmp-server/srs/issues/310), the aac profile must be object plus one. 1.0.26 | ||
| 487 | -* v1.0, 2015-01-25, hotfix [#268](https://github.com/simple-rtmp-server/srs/issues/268), refine the pcr start at 0, dts/pts plus delay. 1.0.25 | ||
| 488 | -* v1.0, 2015-01-25, hotfix [#151](https://github.com/simple-rtmp-server/srs/issues/151), refine pcr=dts-800ms and use dts/pts directly. 1.0.24 | ||
| 489 | -* v1.0, 2015-01-23, hotfix [#151](https://github.com/simple-rtmp-server/srs/issues/151), use absolutely overflow to make jwplayer happy. 1.0.23 | ||
| 490 | -* v1.0, 2015-01-17, hotfix [#290](https://github.com/simple-rtmp-server/srs/issues/290), use iformat only for rtmp input. 1.0.22 | ||
| 491 | -* <strong>v1.0, 2015-01-15, [1.0r1 release(1.0.21)](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r1) released. 59472 lines.</strong> | ||
| 492 | -* v1.0, 2015-01-08, hotfix [#281](https://github.com/simple-rtmp-server/srs/issues/281), fix hls bug ignore type-9 send aud. 1.0.20 | ||
| 493 | -* v1.0, 2015-01-03, hotfix to remove the pageUrl for http callback. 1.0.19 | ||
| 494 | -* v1.0, 2015-01-02, hotfix [#207](https://github.com/simple-rtmp-server/srs/issues/207), trim the last 0 of log. 1.0.18 | ||
| 495 | -* v1.0, 2015-01-02, hotfix [#216](https://github.com/simple-rtmp-server/srs/issues/216), http-callback post in application/json content-type. 1.0.17 | ||
| 496 | -* v1.0, 2015-01-01, hotfix [#270](https://github.com/simple-rtmp-server/srs/issues/270), memory leak for http client post. 1.0.16 | ||
| 497 | -* v1.0, 2014-12-29, hotfix [#267](https://github.com/simple-rtmp-server/srs/issues/267), the forward dest ep should use server. 1.0.15 | ||
| 498 | -* v1.0, 2014-12-29, hotfix [#268](https://github.com/simple-rtmp-server/srs/issues/268), the hls pcr is negative when startup. 1.0.14 | ||
| 499 | -* v1.0, 2014-12-22, hotfix [#264](https://github.com/simple-rtmp-server/srs/issues/264), ignore NALU when sequence header to make HLS happy. 1.0.12 | ||
| 500 | -* v1.0, 2014-12-20, hotfix [#264](https://github.com/simple-rtmp-server/srs/issues/264), support disconnect publish connect when hls error. 1.0.11 | ||
| 501 | -* <strong>v1.0, 2014-12-05, [1.0 release(1.0.10)](https://github.com/simple-rtmp-server/srs/releases/tag/1.0) released. 59391 lines.</strong> | ||
| 502 | * <strong>v1.0, 2014-10-09, [1.0 beta(1.0.0)](https://github.com/simple-rtmp-server/srs/releases/tag/1.0.beta) released. 59316 lines.</strong> | 469 | * <strong>v1.0, 2014-10-09, [1.0 beta(1.0.0)](https://github.com/simple-rtmp-server/srs/releases/tag/1.0.beta) released. 59316 lines.</strong> |
| 503 | * v1.0, 2014-10-08, fix [#151](https://github.com/simple-rtmp-server/srs/issues/151), always reap ts whatever audio or video packet. 0.9.223. | 470 | * v1.0, 2014-10-08, fix [#151](https://github.com/simple-rtmp-server/srs/issues/151), always reap ts whatever audio or video packet. 0.9.223. |
| 504 | * v1.0, 2014-10-08, fix [#162](https://github.com/simple-rtmp-server/srs/issues/162), failed if no epoll. 0.9.222. | 471 | * v1.0, 2014-10-08, fix [#162](https://github.com/simple-rtmp-server/srs/issues/162), failed if no epoll. 0.9.222. |
| @@ -1027,6 +994,7 @@ Winlin | @@ -1027,6 +994,7 @@ Winlin | ||
| 1027 | 994 | ||
| 1028 | [branch2]: https://github.com/simple-rtmp-server/srs/tree/2.0release | 995 | [branch2]: https://github.com/simple-rtmp-server/srs/tree/2.0release |
| 1029 | [release2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release20 | 996 | [release2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release20 |
| 997 | +[release3]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release30 | ||
| 1030 | [centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.32.zip | 998 | [centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.32.zip |
| 1031 | [centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.32.zip | 999 | [centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.32.zip |
| 1032 | 1000 |
-
请 注册 或 登录 后发表评论