[vlc-commits] demux:mkv: use the TrustLevel type when looking for seekpoint boundaries

Steve Lhomme git at videolan.org
Fri Aug 4 10:07:26 CEST 2017


vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Thu Aug  3 18:18:27 2017 +0200| [a44b301f4f75489d0cedc49d8b084d584b79a403] | committer: Jean-Baptiste Kempf

demux:mkv: use the TrustLevel type when looking for seekpoint boundaries

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/mkv/matroska_segment_seeker.cpp | 3 ++-
 modules/demux/mkv/matroska_segment_seeker.hpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment_seeker.cpp b/modules/demux/mkv/matroska_segment_seeker.cpp
index 928c33a819..188e3e5716 100644
--- a/modules/demux/mkv/matroska_segment_seeker.cpp
+++ b/modules/demux/mkv/matroska_segment_seeker.cpp
@@ -151,7 +151,8 @@ SegmentSeeker::find_greatest_seekpoints_in_range( fptr_t start_fpos, mtime_t end
 }
 
 SegmentSeeker::seekpoint_pair_t
-SegmentSeeker::get_seekpoints_around( mtime_t pts, seekpoints_t const& seekpoints, int trust_level )
+SegmentSeeker::get_seekpoints_around( mtime_t pts, seekpoints_t const& seekpoints,
+                                      Seekpoint::TrustLevel trust_level )
 {
     if( seekpoints.empty() )
     {
diff --git a/modules/demux/mkv/matroska_segment_seeker.hpp b/modules/demux/mkv/matroska_segment_seeker.hpp
index 8633f463ab..4eb9fc255a 100644
--- a/modules/demux/mkv/matroska_segment_seeker.hpp
+++ b/modules/demux/mkv/matroska_segment_seeker.hpp
@@ -101,7 +101,7 @@ class SegmentSeeker
 
         void add_seekpoint( track_id_t track_id, Seekpoint::TrustLevel level, fptr_t fpos, mtime_t pts );
 
-        seekpoint_pair_t get_seekpoints_around( mtime_t, seekpoints_t const&, int = Seekpoint::DISABLED );
+        seekpoint_pair_t get_seekpoints_around( mtime_t, seekpoints_t const&, Seekpoint::TrustLevel = Seekpoint::DISABLED );
         seekpoint_pair_t get_seekpoints_around( mtime_t, track_ids_t const& );
 
         tracks_seekpoint_t get_seekpoints( matroska_segment_c&, mtime_t, track_ids_t const& );



More information about the vlc-commits mailing list