vlc | branch: master | Steve Lhomme <[email protected]> | Fri Jul 6 08:49:31 2018 +0200| [4d5b9369bd65a4e7ba3d9ec6ffb9ce8d2a6920ea] | committer: Steve Lhomme
demux:dash: use std::max() to compute the minimum buffer duration > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4d5b9369bd65a4e7ba3d9ec6ffb9ce8d2a6920ea --- modules/demux/dash/DASHManager.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/demux/dash/DASHManager.cpp b/modules/demux/dash/DASHManager.cpp index 9d68aba8b4..795ff0555b 100644 --- a/modules/demux/dash/DASHManager.cpp +++ b/modules/demux/dash/DASHManager.cpp @@ -80,8 +80,7 @@ void DASHManager::scheduleNextUpdate() if(playlist->minUpdatePeriod.Get() > minbuffer) minbuffer = playlist->minUpdatePeriod.Get(); - if(minbuffer < VLC_TICK_FROM_SEC(5)) - minbuffer = VLC_TICK_FROM_SEC(5); + minbuffer = std::max(minbuffer, VLC_TICK_FROM_SEC(5)); nextPlaylistupdate = now + minbuffer / CLOCK_FREQ; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
