[vlc-commits] demux:mkv: remove dead code

Steve Lhomme git at videolan.org
Thu Jan 25 17:39:36 CET 2018


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jan 25 13:22:54 2018 +0100| [71284f99243b9f2098c8b60ae47a52cfa71f14e4] | committer: Jean-Baptiste Kempf

demux:mkv: remove dead code

We can't get here if we don't have a parser for the segment

(cherry picked from commit 1a4c3bdf5597295b2609e338f6d6e9f38bf2c1e3)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

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

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index 526d793eca..9ad4ec70c0 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -1312,9 +1312,6 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, KaxSimpleBlock * & pp_s
         EbmlElement *el = NULL;
         int         i_level;
 
-        if ( ep == NULL )
-            return VLC_EGENERIC;
-
         if( pp_simpleblock != NULL || ((el = ep->Get()) == NULL && pp_block != NULL) )
         {
             /* Check blocks validity to protect againts broken files */



More information about the vlc-commits mailing list