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-20 15:10:34 +0800
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
3ca906d5605d941f0c766f692f98d47ce0b5d794
3ca906d5
2 parents
b1142d83
014993ad
Merge branch '2.0release' into develop
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
2 行增加
和
1 行删除
trunk/scripts/_log.sh
trunk/src/app/srs_app_hls.cpp
trunk/scripts/_log.sh
查看文件 @
3ca906d
...
...
@@ -38,7 +38,7 @@ failed_msg(){
function
check_log
(){
log_dir
=
"
`
dirname
$log
`
"
(
mkdir -p
${
log_dir
}
&&
sudo
chmod 777
${
log_dir
}
&&
touch
$log
)
(
mkdir -p
${
log_dir
}
&&
chmod 777
${
log_dir
}
&&
touch
$log
)
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
failed_msg
"create log failed, ret=
$ret
"
;
return
$ret
;
fi
ok_msg
"create log(
${
log
}
) success"
...
...
trunk/src/app/srs_app_hls.cpp
查看文件 @
3ca906d
...
...
@@ -346,6 +346,7 @@ bool SrsHlsMuxer::is_segment_overflow()
bool
SrsHlsMuxer
::
is_segment_absolutely_overflow
()
{
// @see https://github.com/winlinvip/simple-rtmp-server/issues/151#issuecomment-83553950
srs_assert
(
current
);
return
current
->
duration
>=
hls_aof_ratio
*
hls_fragment
;
}
...
...
请
注册
或
登录
后发表评论