[vlc-commits] mkv: remove doublon code

Steve Lhomme git at videolan.org
Wed Mar 16 07:04:40 CET 2016


vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Tue Mar 15 15:45:56 2016 +0100| [62537cd9c4b0b154ae05d5f8412bebf6719c4a7b] | committer: Jean-Baptiste Kempf

mkv: remove doublon code

this code is already handled after trying to read a block and after checking
for the current chapter to use

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

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

 modules/demux/mkv/mkv.cpp |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 4d7b6b4..7d6979c 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -721,12 +721,6 @@ static int Demux( demux_t *p_demux)
         if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
             return 1;
 
-    if ( p_vsegment->CurrentEdition() &&
-         p_vsegment->CurrentEdition()->b_ordered &&
-         p_vsegment->CurrentChapter() == NULL )
-        /* nothing left to read in this ordered edition */
-        return 0;
-
     KaxBlock *block;
     KaxSimpleBlock *simpleblock;
     int64_t i_block_duration = 0;



More information about the vlc-commits mailing list