external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-03-20 15:10:34 +08:00
commit 3ca906d560
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/scripts/_log.sh
View file

@ -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"

1
trunk/src/app/srs_app_hls.cpp
View file

@ -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;
}