vlc | branch: master | Steve Lhomme <[email protected]> | Mon Jun 11 15:11:08 2018 +0200| [157d23d40c76622ea689c2bbd29c3cb5c8cc8b95] | committer: Steve Lhomme
demux:adaptive: doDemux is given an mtime_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=157d23d40c76622ea689c2bbd29c3cb5c8cc8b95 --- modules/demux/adaptive/PlaylistManager.cpp | 2 +- modules/demux/adaptive/PlaylistManager.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp index d6571b3f21..7c44639257 100644 --- a/modules/demux/adaptive/PlaylistManager.cpp +++ b/modules/demux/adaptive/PlaylistManager.cpp @@ -412,7 +412,7 @@ int PlaylistManager::demux_callback(demux_t *p_demux) return manager->doDemux(DEMUX_INCREMENT); } -int PlaylistManager::doDemux(int64_t increment) +int PlaylistManager::doDemux(mtime_t increment) { vlc_mutex_lock(&demux.lock); if(demux.i_nzpcr == VLC_TS_INVALID) diff --git a/modules/demux/adaptive/PlaylistManager.h b/modules/demux/adaptive/PlaylistManager.h index 702aef64ee..be0ba434f0 100644 --- a/modules/demux/adaptive/PlaylistManager.h +++ b/modules/demux/adaptive/PlaylistManager.h @@ -72,7 +72,7 @@ namespace adaptive protected: /* Demux calls */ virtual int doControl(int, va_list); - virtual int doDemux(int64_t); + virtual int doDemux(mtime_t); virtual bool setPosition(mtime_t); virtual mtime_t getDuration() const; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
