[vlc-commits] demux:mkv: put the lighter tests first

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Mon Nov 13 18:08:41 2017 +0100| [b26e21f666ce4d403902e55519effcbb9a87f391] | committer: Jean-Baptiste Kempf

demux:mkv: put the lighter tests first

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

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

 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;