胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
3f0c8059 1 parent b7b268df

update reamde

内嵌 并排对比
正在显示 1 个修改的文件 包含 5 行增加 和 1 行删除
@@ -475,7 +475,7 @@ Supported operating systems and hardware: @@ -475,7 +475,7 @@ Supported operating systems and hardware:
475 1. Support custom dvr path and http callback, read 475 1. Support custom dvr path and http callback, read
476 [#179](https://github.com/winlinvip/simple-rtmp-server/issues/179) and 476 [#179](https://github.com/winlinvip/simple-rtmp-server/issues/179) and
477 [274](https://github.com/winlinvip/simple-rtmp-server/issues/274). 477 [274](https://github.com/winlinvip/simple-rtmp-server/issues/274).
478 -1. Support rtmp remux to http flv live stream, read 478 +1. Support rtmp remux to http flv/mp3/aac live stream, read
479 [#293](https://github.com/winlinvip/simple-rtmp-server/issues/293)( 479 [#293](https://github.com/winlinvip/simple-rtmp-server/issues/293)(
480 [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpFlvStream), 480 [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpFlvStream),
481 [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpFlvStream) 481 [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpFlvStream)
@@ -515,6 +515,8 @@ Supported operating systems and hardware: @@ -515,6 +515,8 @@ Supported operating systems and hardware:
515 515
516 ## History 516 ## History
517 517
  518 +### SRS 2.0 history
  519 +
518 * v2.0, 2015-01-19, fix [#293](https://github.com/winlinvip/simple-rtmp-server/issues/293), support http live flv/aac/mp3 stream with fast cache. 2.0.100. 520 * v2.0, 2015-01-19, fix [#293](https://github.com/winlinvip/simple-rtmp-server/issues/293), support http live flv/aac/mp3 stream with fast cache. 2.0.100.
519 * v2.0, 2015-01-18, fix [#293](https://github.com/winlinvip/simple-rtmp-server/issues/293), support rtmp remux to http flv live stream. 2.0.99. 521 * v2.0, 2015-01-18, fix [#293](https://github.com/winlinvip/simple-rtmp-server/issues/293), support rtmp remux to http flv live stream. 2.0.99.
520 * v2.0, 2015-01-17, fix [#277](https://github.com/winlinvip/simple-rtmp-server/issues/277), refine http server refer to go http-framework. 2.0.98 522 * v2.0, 2015-01-17, fix [#277](https://github.com/winlinvip/simple-rtmp-server/issues/277), refine http server refer to go http-framework. 2.0.98
@@ -574,6 +576,8 @@ Supported operating systems and hardware: @@ -574,6 +576,8 @@ Supported operating systems and hardware:
574 * v2.0, 2014-10-18, remove supports for OSX(darwin). 2.0.1. 576 * v2.0, 2014-10-18, remove supports for OSX(darwin). 2.0.1.
575 * v2.0, 2014-10-16, revert github srs README to English. 2.0.0. 577 * v2.0, 2014-10-16, revert github srs README to English. 2.0.0.
576 578
  579 +### SRS 1.0 history
  580 +
577 * v1.0, 2015-01-17, hotfix [#290](https://github.com/winlinvip/simple-rtmp-server/issues/290), use iformat only for rtmp input. 1.0.22 581 * v1.0, 2015-01-17, hotfix [#290](https://github.com/winlinvip/simple-rtmp-server/issues/290), use iformat only for rtmp input. 1.0.22
578 * <strong>v1.0, 2015-01-15, [1.0r1 release(1.0.21)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r1) released. 59472 lines.</strong> 582 * <strong>v1.0, 2015-01-15, [1.0r1 release(1.0.21)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r1) released. 59472 lines.</strong>
579 * v1.0, 2015-01-08, hotfix [#281](https://github.com/winlinvip/simple-rtmp-server/issues/281), fix hls bug ignore type-9 send aud. 1.0.20 583 * v1.0, 2015-01-08, hotfix [#281](https://github.com/winlinvip/simple-rtmp-server/issues/281), fix hls bug ignore type-9 send aud. 1.0.20