]> git.sesse.net Git - vlc/commitdiff
MKV: init the index time to -1 as it was intended
authorSteve Lhomme <robUx4@videolabs.io>
Fri, 13 Mar 2015 13:12:45 +0000 (14:12 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 13 Mar 2015 14:29:30 +0000 (15:29 +0100)
As witnessed here git.videolan.org/?p=vlc.git;a=blob;f=modules/demux/mkv/matroska_segment.cpp;hb=HEAD#l1427

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/demux/mkv/matroska_segment.cpp
modules/demux/mkv/mkv.cpp

index 18558f7f29673c8817fb2ec292d6e72192c63cc4..acfc321883bf3f8964fee996a3bf4411baf075a3 100644 (file)
@@ -129,7 +129,7 @@ void matroska_segment_c::LoadCues( KaxCues *cues )
             idx.i_track       = -1;
             idx.i_block_number= -1;
             idx.i_position    = -1;
-            idx.i_time        = 0;
+            idx.i_time        = -1;
             idx.b_key         = true;
 
             ep->Down();
@@ -953,7 +953,7 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_
     {
 
         for( ; i_idx < i_index; i_idx++ )
-            if( p_indexes[i_idx].i_time + i_time_offset > i_date )
+            if( p_indexes[i_idx].i_time != -1 && p_indexes[i_idx].i_time + i_time_offset > i_date )
                 break;
 
         if( i_idx > 0 )
index ce64952ea23f9b241531f9189a84b16b27b247bb..101ca6c4e3c536d45b554f69a605152355e76281 100644 (file)
@@ -468,7 +468,7 @@ static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, virtual_ch
             for( i_index = 0; i_index < p_segment->i_index; i_index++ )
             {
                 if( p_segment->p_indexes[i_index].i_position >= i_pos &&
-                    p_segment->p_indexes[i_index].i_time > 0 )
+                    p_segment->p_indexes[i_index].i_time != -1 )
                     break;
             }
             if( i_index == p_segment->i_index )