[vlc-commits] demux/mkv: do not give up if BlockGet fails

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Sat Oct 22 04:54:09 2016 +0200| [4828b0f77598a79f92e4799b57757ae4902fb54e] | committer: Thomas Guillem

demux/mkv: do not give up if BlockGet fails

We should not completely give up just because we cannot read the next
block, instead we simply break out of the loop, mark the range that we
could search as searched, and get on with our day.

Signed-off-by: Steve Lhomme <robux4 at videolabs.io>
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

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

 modules/demux/mkv/matroska_segment_seeker.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment_seeker.cpp b/modules/demux/mkv/matroska_segment_seeker.cpp
index dcab581..ac833e0 100644
--- a/modules/demux/mkv/matroska_segment_seeker.cpp
+++ b/modules/demux/mkv/matroska_segment_seeker.cpp
@@ -315,9 +315,7 @@ SegmentSeeker::index_unsearched_range( matroska_segment_c& ms, Range search_area
         matroska_segment_c::tracks_map_t::iterator i_track = ms.tracks.end();
 
         if( ms.BlockGet( block, simpleblock, &b_key_picture, &b_discardable_picture, &i_block_duration ) )
-        {
-            throw std::runtime_error( "Unable to BlockGet in SegmentSeeker::index_unsearched_range, EOF?" );
-        }
+            break;
 
         if( simpleblock ) {
             block_pos = simpleblock->GetElementPosition();