胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
53d9faf3 1 parent eea31ef4

for #293, update readme.

内嵌 并排对比
正在显示 2 个修改的文件 包含 4 行增加 和 1 行删除
@@ -475,6 +475,8 @@ Supported operating systems and hardware: @@ -475,6 +475,8 @@ 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
  479 +[#293](https://github.com/winlinvip/simple-rtmp-server/issues/293).
478 1. [no-plan] Support <500ms latency, FRSC(Fast RTMP-compatible Stream Channel tech). 480 1. [no-plan] Support <500ms latency, FRSC(Fast RTMP-compatible Stream Channel tech).
479 1. [no-plan] Support RTMP 302 redirect [#92](https://github.com/winlinvip/simple-rtmp-server/issues/92). 481 1. [no-plan] Support RTMP 302 redirect [#92](https://github.com/winlinvip/simple-rtmp-server/issues/92).
480 1. [no-plan] Support multiple processes, for both origin and edge 482 1. [no-plan] Support multiple processes, for both origin and edge
@@ -510,6 +512,7 @@ Supported operating systems and hardware: @@ -510,6 +512,7 @@ Supported operating systems and hardware:
510 512
511 ## History 513 ## History
512 514
  515 +* 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.
513 * 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 516 * 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
514 * v2.0, 2015-01-17, for [#277](https://github.com/winlinvip/simple-rtmp-server/issues/277), refine http api refer to go http-framework. 2.0.97 517 * v2.0, 2015-01-17, for [#277](https://github.com/winlinvip/simple-rtmp-server/issues/277), refine http api refer to go http-framework. 2.0.97
515 * v2.0, 2015-01-17, hotfix [#290](https://github.com/winlinvip/simple-rtmp-server/issues/290), use iformat only for rtmp input. 2.0.95 518 * v2.0, 2015-01-17, hotfix [#290](https://github.com/winlinvip/simple-rtmp-server/issues/290), use iformat only for rtmp input. 2.0.95
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 2 32 #define VERSION_MAJOR 2
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 98 34 +#define VERSION_REVISION 99
35 35
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"