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
2014-03-10 19:13:18 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
2fa0d6018680767aec6b717de74c30a6e4e1e6cd
2fa0d601
1 parent
13d9b44c
simplify usage
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
12 行增加
和
0 行删除
trunk/auto/depends.sh
trunk/conf/hls.conf
trunk/conf/rtmp.conf
trunk/conf/srs.19350.conf
trunk/auto/depends.sh
查看文件 @
2fa0d60
...
...
@@ -270,6 +270,9 @@ if [ $SRS_HLS = YES ]; then
ln -sf
`
pwd
`
/research/players
${
SRS_OBJS
}
/nginx/html/players
&&
rm -f
${
SRS_OBJS
}
/nginx/crossdomain.xml
&&
ln -sf
`
pwd
`
/research/players/crossdomain.xml
${
SRS_OBJS
}
/nginx/html/crossdomain.xml
# nginx.html to detect whether nginx is alive
echo
"nginx is ok"
>
${
SRS_OBJS
}
/nginx/html/nginx.html
fi
if
[
$SRS_HLS
=
YES
]
;
then
...
...
trunk/conf/hls.conf
0 → 100644
查看文件 @
2fa0d60
listen
1935
;
vhost
__
defaultVhost__
{
hls
{
enabled
on
;
hls_path
./
objs
/
nginx
/
html
;
hls_fragment
10
;
hls_window
60
;
}
}
...
...
trunk/conf/rtmp.conf
100755 → 100644
查看文件 @
2fa0d60
trunk/conf/srs.19350.conf
100755 → 100644
查看文件 @
2fa0d60
请
注册
或
登录
后发表评论