Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-03-15 07:48:27 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
636bc574af5a8b83ffa71565ba3f772581dd84a5
636bc574
1 parent
5e19f5f2
start 2.0release, 80773 lines.
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
4 行增加
和
4 行删除
README.md
trunk/scripts/git.commit.sh
README.md
查看文件 @
636bc57
...
...
@@ -178,7 +178,6 @@ Report Bug: [https://github.com/winlinvip/simple-rtmp-server/issues/new](https:/
WebSite:
[
http://ossrs.net
](
http://ossrs.net
)
<br/>
Release:
[
http://winlinvip.github.io/srs.release
](
http://winlinvip.github.io/srs.release
)
<br/>
Blog:
[
http://blog.csdn.net/win_lin
](
http://blog.csdn.net/win_lin
)
<br/>
QQ Group: 365936885, by wenjie
<br/>
Wiki:
[
https://github.com/winlinvip/simple-rtmp-server/wiki
](
https://github.com/winlinvip/simple-rtmp-server/wiki
)
<br/>
StreamServers:
[
BLS
](
https://github.com/wenjiegit/Bull-Live-Server
)
/
[
BLE
](
https://github.com/wenjiegit/Bull-Live-Encoder
)
,
[
NGINX-RTMP
](
https://github.com/arut/nginx-rtmp-module
)
,
[
CRTMPD
](
http://www.rtmpd.com/
)
,
...
...
@@ -494,8 +493,7 @@ Supported operating systems and hardware:
[
CN
](
https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_FlvVodStream
)
,
[
EN
](
https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_FlvVodStream
)
).
1.
Stable
[
1.0release branch
](
https://github.com/winlinvip/simple-rtmp-server/tree/1.0release
)
and
[
2.0dev branch
](
https://github.com/winlinvip/simple-rtmp-server/tree/master
)
.
1.
Stable
[
1.0release branch
](
https://github.com/winlinvip/simple-rtmp-server/tree/1.0release
)
.
1.
Support publish h264 raw stream(
[
CN
](
https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data
)
,
[
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:
[
#250
](
https://github.com/winlinvip/simple-rtmp-server/issues/250
)
.
1.
[
experiment
]
Support push RTSP to SRS, read
[
#133
](
https://github.com/winlinvip/simple-rtmp-server/issues/133
)
.
1.
Start
[
2.0release branch
](
https://github.com/winlinvip/simple-rtmp-server/tree/2.0release
)
.
1.
[
no-plan
]
Support <500ms latency, FRSC(Fast RTMP-compatible Stream Channel tech).
1.
[
no-plan
]
Support RTMP 302 redirect
[
#92
](
https://github.com/winlinvip/simple-rtmp-server/issues/92
)
.
1.
[
no-plan
]
Support multiple processes, for both origin and edge
...
...
@@ -572,6 +571,7 @@ Supported operating systems and hardware:
### SRS 2.0 history
*
v2.0, 2015-03-15, start
[
2.0release branch
](
https://github.com/winlinvip/simple-rtmp-server/tree/2.0release
)
, 80773 lines.
*
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.
*
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.
*
v2.0, 2015-03-12, fix
[
#328
](
https://github.com/winlinvip/simple-rtmp-server/issues/328
)
, support adobe hds. 2.0.138.
...
...
trunk/scripts/git.commit.sh
查看文件 @
636bc57
...
...
@@ -23,7 +23,7 @@ work_dir=`(cd ${work_dir}/.. && pwd)`
product_dir
=
$work_dir
# allow start script from any dir
cd
$work_dir
&&
git checkout
develop
cd
$work_dir
&&
git checkout
2.0release
.
${
product_dir
}
/scripts/_log.sh
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
exit
$ret
;
fi
...
...
请
注册
或
登录
后发表评论