]> git.sesse.net Git - vlc/commitdiff
MKV: less strict warning of normal situations
authorSteve Lhomme <robUx4@videolabs.io>
Tue, 24 Feb 2015 15:34:24 +0000 (16:34 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 24 Feb 2015 15:38:59 +0000 (16:38 +0100)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/demux/mkv/Ebml_parser.cpp

index a42b9369162271898354edfd9f313aee81e942b9..b45a2d5b14119dce1a4dda3b869058b19348184b 100644 (file)
@@ -102,7 +102,7 @@ EbmlElement* EbmlParser::UnGet( uint64 i_block_pos, uint64 i_cluster_pos )
 
 void EbmlParser::Up( void )
 {
-    if( mi_user_level == mi_level )
+    if( mi_user_level == mi_level && m_el[mi_level] )
     {
         msg_Warn( p_demux, "MKV/Ebml Parser: Up cannot escape itself" );
     }
@@ -232,7 +232,7 @@ EbmlElement *EbmlParser::Get( int n_call )
     }
     else if( m_el[mi_level] == NULL )
     {
-        msg_Warn( p_demux,"MKV/Ebml Parser: m_el[mi_level] == NULL\n" );
+        msg_Dbg( p_demux,"MKV/Ebml Parser: m_el[mi_level] == NULL" );
     }
     else if( m_el[mi_level]->IsDummy() && !mb_dummy )
     {