[vlc-devel] [PATCH 1/2] demux:mkv: do not use invalid seekpoints for the final seek target

Steve Lhomme robux4 at videolabs.io
Fri Aug 4 11:31:43 CEST 2017


---
 modules/demux/mkv/matroska_segment_seeker.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment_seeker.cpp b/modules/demux/mkv/matroska_segment_seeker.cpp
index f55a279fde..75cee3a640 100644
--- a/modules/demux/mkv/matroska_segment_seeker.cpp
+++ b/modules/demux/mkv/matroska_segment_seeker.cpp
@@ -224,10 +224,12 @@ SegmentSeeker::get_seekpoints_around( mtime_t target_pts, track_ids_t const& pri
                 continue;
             }
 
-            if( points.first.fpos > track_points.first.fpos )
+            if( track_points.first.trust_level > Seekpoint::DISABLED &&
+                points.first.fpos > track_points.first.fpos )
                 points.first = track_points.first;
 
-            if( points.second.fpos < track_points.second.fpos )
+            if( track_points.second.trust_level > Seekpoint::DISABLED &&
+                points.second.fpos < track_points.second.fpos )
                 points.second = track_points.second;
         }
     }
-- 
2.12.1



More information about the vlc-devel mailing list