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
2013-12-18 15:22:14 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
6beff7cf54297838e01646fcd4a7785daedb9ab8
6beff7cf
1 parent
609a8fa4
fix build script bug, create nginx/html/live dir
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
5 行增加
和
3 行删除
trunk/auto/depends.sh
trunk/conf/srs.conf
trunk/auto/depends.sh
查看文件 @
6beff7c
...
...
@@ -331,8 +331,10 @@ fi
#####################################################################################
# build research code
#####################################################################################
(
cd
research/hls
&&
make
)
mkdir -p
${
SRS_OBJS
}
/research
(
cd
research/hls
&&
make
&&
mv ts_info ../../
${
SRS_OBJS
}
/research
)
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
echo
"build research/hls failed, ret=
$ret
"
;
exit
$ret
;
fi
(
cd
research/ffempty
&&
make
)
(
cd
research/ffempty
&&
make
&&
mv ffempty ../../
${
SRS_OBJS
}
/research
)
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
echo
"build research/ffempty failed, ret=
$ret
"
;
exit
$ret
;
fi
...
...
trunk/conf/srs.conf
查看文件 @
6beff7c
...
...
@@ -571,7 +571,7 @@ vhost all.transcode.vhost.com {
vhost
ffempty
.
transcode
.
vhost
.
com
{
transcode
{
enabled
on
;
ffmpeg
./
research
/
ffempty
/
ffempty
;
ffmpeg
./
objs
/
research
/
ffempty
;
engine
empty
{
enabled
on
;
vcodec
libx264
;
...
...
请
注册
或
登录
后发表评论