[vlc-devel] [PATCH 2/7] demux:mkv: put the lighter tests first

Steve Lhomme robux4 at videolabs.io
Mon Nov 13 18:08:41 CET 2017


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

diff --git a/modules/demux/mkv/Ebml_parser.cpp b/modules/demux/mkv/Ebml_parser.cpp
index b6dd6cb76a..1e3099cfac 100644
--- a/modules/demux/mkv/Ebml_parser.cpp
+++ b/modules/demux/mkv/Ebml_parser.cpp
@@ -213,9 +213,9 @@ EbmlElement *EbmlParser::Get( int n_call )
             return NULL;
         }
 
-        if( p_prev && p_prev->IsFiniteSize() &&
-            p_prev->GetEndPosition() != m_el[mi_level]->GetElementPosition() &&
-            mi_level > 1 )
+        if( mi_level > 1 &&
+            p_prev && p_prev->IsFiniteSize() &&
+            p_prev->GetEndPosition() != m_el[mi_level]->GetElementPosition() )
         {
             msg_Err( p_demux, "Dummy Element at unexpected position... corrupted file?" );
             b_bad_position = true;
-- 
2.14.2



More information about the vlc-devel mailing list