胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
636bc574 1 parent 5e19f5f2

start 2.0release, 80773 lines.

内嵌 并排对比
正在显示 2 个修改的文件 包含 4 行增加 和 4 行删除
@@ -178,7 +178,6 @@ Report Bug: [https://github.com/winlinvip/simple-rtmp-server/issues/new](https:/ @@ -178,7 +178,6 @@ Report Bug: [https://github.com/winlinvip/simple-rtmp-server/issues/new](https:/
178 WebSite: [http://ossrs.net](http://ossrs.net) <br/> 178 WebSite: [http://ossrs.net](http://ossrs.net) <br/>
179 Release: [http://winlinvip.github.io/srs.release](http://winlinvip.github.io/srs.release) <br/> 179 Release: [http://winlinvip.github.io/srs.release](http://winlinvip.github.io/srs.release) <br/>
180 Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) <br/> 180 Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) <br/>
181 -QQ Group: 365936885, by wenjie <br/>  
182 Wiki: [https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki) <br/> 181 Wiki: [https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki) <br/>
183 StreamServers：[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https://github.com/wenjiegit/Bull-Live-Encoder), 182 StreamServers：[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https://github.com/wenjiegit/Bull-Live-Encoder),
184 [NGINX-RTMP](https://github.com/arut/nginx-rtmp-module), [CRTMPD](http://www.rtmpd.com/), 183 [NGINX-RTMP](https://github.com/arut/nginx-rtmp-module), [CRTMPD](http://www.rtmpd.com/),
@@ -494,8 +493,7 @@ Supported operating systems and hardware: @@ -494,8 +493,7 @@ Supported operating systems and hardware:
494 [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_FlvVodStream), 493 [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_FlvVodStream),
495 [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_FlvVodStream) 494 [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_FlvVodStream)
496 ). 495 ).
497 -1. Stable [1.0release branch](https://github.com/winlinvip/simple-rtmp-server/tree/1.0release) and  
498 -[2.0dev branch](https://github.com/winlinvip/simple-rtmp-server/tree/master). 496 +1. Stable [1.0release branch](https://github.com/winlinvip/simple-rtmp-server/tree/1.0release).
499 1. Support publish h264 raw stream( 497 1. Support publish h264 raw stream(
500 [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data), 498 [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data),
501 [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_SrsLibrtmp#publish-h264-raw-data) 499 [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_SrsLibrtmp#publish-h264-raw-data)
@@ -535,6 +533,7 @@ Supported operating systems and hardware: @@ -535,6 +533,7 @@ Supported operating systems and hardware:
535 [#250](https://github.com/winlinvip/simple-rtmp-server/issues/250). 533 [#250](https://github.com/winlinvip/simple-rtmp-server/issues/250).
536 1. [experiment] Support push RTSP to SRS, read 534 1. [experiment] Support push RTSP to SRS, read
537 [#133](https://github.com/winlinvip/simple-rtmp-server/issues/133). 535 [#133](https://github.com/winlinvip/simple-rtmp-server/issues/133).
  536 +1. Start [2.0release branch](https://github.com/winlinvip/simple-rtmp-server/tree/2.0release).
538 1. [no-plan] Support <500ms latency, FRSC(Fast RTMP-compatible Stream Channel tech). 537 1. [no-plan] Support <500ms latency, FRSC(Fast RTMP-compatible Stream Channel tech).
539 1. [no-plan] Support RTMP 302 redirect [#92](https://github.com/winlinvip/simple-rtmp-server/issues/92). 538 1. [no-plan] Support RTMP 302 redirect [#92](https://github.com/winlinvip/simple-rtmp-server/issues/92).
540 1. [no-plan] Support multiple processes, for both origin and edge 539 1. [no-plan] Support multiple processes, for both origin and edge
@@ -572,6 +571,7 @@ Supported operating systems and hardware: @@ -572,6 +571,7 @@ Supported operating systems and hardware:
572 571
573 ### SRS 2.0 history 572 ### SRS 2.0 history
574 573
  574 +* v2.0, 2015-03-15, start [2.0release branch](https://github.com/winlinvip/simple-rtmp-server/tree/2.0release), 80773 lines.
575 * v2.0, 2015-03-14, fix [#324](https://github.com/winlinvip/simple-rtmp-server/issues/324), support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 575 * v2.0, 2015-03-14, fix [#324](https://github.com/winlinvip/simple-rtmp-server/issues/324), support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.
576 * v2.0, 2015-03-14, for [#324](https://github.com/winlinvip/simple-rtmp-server/issues/324), support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. 576 * v2.0, 2015-03-14, for [#324](https://github.com/winlinvip/simple-rtmp-server/issues/324), support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.
577 * v2.0, 2015-03-12, fix [#328](https://github.com/winlinvip/simple-rtmp-server/issues/328), support adobe hds. 2.0.138. 577 * v2.0, 2015-03-12, fix [#328](https://github.com/winlinvip/simple-rtmp-server/issues/328), support adobe hds. 2.0.138.
@@ -23,7 +23,7 @@ work_dir=`(cd ${work_dir}/.. && pwd)` @@ -23,7 +23,7 @@ work_dir=`(cd ${work_dir}/.. && pwd)`
23 product_dir=$work_dir 23 product_dir=$work_dir
24 24
25 # allow start script from any dir 25 # allow start script from any dir
26 -cd $work_dir && git checkout develop 26 +cd $work_dir && git checkout 2.0release
27 27
28 . ${product_dir}/scripts/_log.sh 28 . ${product_dir}/scripts/_log.sh
29 ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi 29 ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi