Merge pull request #247 from heftig/master

Minor fixes
This commit is contained in:
Sergey Dryabzhinsky 2017-05-23 13:40:46 +04:00 committed by GitHub
commit a898a09d87
2 changed files with 2 additions and 6 deletions

View file

@ -1565,7 +1565,7 @@ ngx_rtmp_dash_cleanup_dir(ngx_str_t *ppath, ngx_msec_t playlen)
"dash: cleanup '%V' allowed, mpd missing '%s'",
&name, mpd_path);
max_age = 0;
max_age = playlen / 500;
} else if (name.len >= 4 && name.data[name.len - 4] == '.' &&
name.data[name.len - 3] == 'm' &&

View file

@ -1138,11 +1138,7 @@ ngx_rtmp_live_data(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
ss->current_time = cs->timestamp;
}
if (data) {
ngx_rtmp_free_shared_chain(cscf, data);
}
if (rpkt && !data) {
if (rpkt) {
ngx_rtmp_free_shared_chain(cscf, rpkt);
}