vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Nov 5 16:34:12 2015 +0100| [f09f614ba9c219843c67157fbd04a57325e70441] | committer: Francois Cartegnie
demux: adaptative: fix warning > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f09f614ba9c219843c67157fbd04a57325e70441 --- modules/demux/dash/DASHManager.cpp | 2 +- modules/demux/hls/playlist/Representation.cpp | 2 +- modules/demux/hls/playlist/Representation.hpp | 2 +- modules/demux/smooth/SmoothManager.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/demux/dash/DASHManager.cpp b/modules/demux/dash/DASHManager.cpp index b931c27..19e382f 100644 --- a/modules/demux/dash/DASHManager.cpp +++ b/modules/demux/dash/DASHManager.cpp @@ -134,7 +134,7 @@ bool DASHManager::updatePlaylist() nextPlaylistupdate = now + (mininterval + (maxinterval - mininterval) / 2) / CLOCK_FREQ; msg_Dbg(p_demux, "Updated MPD, next update in %" PRId64 "s (%" PRId64 "..%" PRId64 ")", - nextPlaylistupdate - now, mininterval/ CLOCK_FREQ, maxinterval/ CLOCK_FREQ ); + (mtime_t) nextPlaylistupdate - now, mininterval/ CLOCK_FREQ, maxinterval/ CLOCK_FREQ ); return true; } diff --git a/modules/demux/hls/playlist/Representation.cpp b/modules/demux/hls/playlist/Representation.cpp index 2b040d3..1e8e8c5 100644 --- a/modules/demux/hls/playlist/Representation.cpp +++ b/modules/demux/hls/playlist/Representation.cpp @@ -131,7 +131,7 @@ void Representation::runLocalUpdates(mtime_t /*currentplaybacktime*/, uint64_t n nextPlaylistupdate = now + (mininterval + (maxinterval - mininterval) / 2) / CLOCK_FREQ; msg_Dbg(playlist->getVLCObject(), "Updated playlist ID %s, next update in %" PRId64 "s", - getID().str().c_str(), nextPlaylistupdate - now); + getID().str().c_str(), (mtime_t) nextPlaylistupdate - now); debug(playlist->getVLCObject(), 0); } diff --git a/modules/demux/hls/playlist/Representation.hpp b/modules/demux/hls/playlist/Representation.hpp index 706d791..780d1fd 100644 --- a/modules/demux/hls/playlist/Representation.hpp +++ b/modules/demux/hls/playlist/Representation.hpp @@ -56,7 +56,7 @@ namespace hls StreamFormat streamFormat; bool b_live; bool b_loaded; - mtime_t nextPlaylistupdate; + time_t nextPlaylistupdate; Url playlistUrl; Property<std::string> audio; Property<std::string> video; diff --git a/modules/demux/smooth/SmoothManager.cpp b/modules/demux/smooth/SmoothManager.cpp index 10919b4..42e9ed9 100644 --- a/modules/demux/smooth/SmoothManager.cpp +++ b/modules/demux/smooth/SmoothManager.cpp @@ -143,7 +143,7 @@ bool SmoothManager::updatePlaylist() nextPlaylistupdate = now + (mininterval + (maxinterval - mininterval) / 2) / CLOCK_FREQ; // msg_Dbg(p_demux, "Updated Manifest, next update in %" PRId64 "s (%" PRId64 "..%" PRId64 ")", -// nextPlaylistupdate - now, mininterval/ CLOCK_FREQ, maxinterval/ CLOCK_FREQ ); +// (mtime_t) nextPlaylistupdate - now, mininterval/ CLOCK_FREQ, maxinterval/ CLOCK_FREQ ); return true; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
