[vlc-commits] adaptive: include <algorithm> for std::min

Steve Lhomme git at videolan.org
Mon Jul 11 11:33:11 CEST 2016


vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Mon Jul 11 10:44:58 2016 +0200| [a6e1c27bf04762577fe386d056ee752645e11a7a] | committer: Hugo Beauzée-Luyssen

adaptive: include <algorithm> for std::min

Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a6e1c27bf04762577fe386d056ee752645e11a7a
---

 modules/demux/adaptive/PlaylistManager.cpp           |    1 +
 modules/demux/adaptive/playlist/AbstractPlaylist.cpp |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp
index ef8375e..1b78e56 100644
--- a/modules/demux/adaptive/PlaylistManager.cpp
+++ b/modules/demux/adaptive/PlaylistManager.cpp
@@ -38,6 +38,7 @@
 #include <vlc_demux.h>
 #include <vlc_threads.h>
 
+#include <algorithm>
 #include <ctime>
 
 using namespace adaptive::http;
diff --git a/modules/demux/adaptive/playlist/AbstractPlaylist.cpp b/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
index c3bbf1d..fb2b7da 100644
--- a/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
+++ b/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
@@ -29,6 +29,8 @@
 #include <vlc_common.h>
 #include <vlc_stream.h>
 
+#include <algorithm>
+
 using namespace adaptive::playlist;
 
 AbstractPlaylist::AbstractPlaylist (vlc_object_t *p_object_) :



More information about the vlc-commits mailing list