[vlc-commits] MKV: less strict warning of normal situations

Steve Lhomme git at videolan.org
Tue Feb 24 16:39:31 CET 2015


vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Tue Feb 24 16:34:24 2015 +0100| [22152f576f86047cad51509f3beebb5038fa0a03] | committer: Jean-Baptiste Kempf

MKV: less strict warning of normal situations

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

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

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

diff --git a/modules/demux/mkv/Ebml_parser.cpp b/modules/demux/mkv/Ebml_parser.cpp
index a42b936..b45a2d5 100644
--- a/modules/demux/mkv/Ebml_parser.cpp
+++ b/modules/demux/mkv/Ebml_parser.cpp
@@ -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 )
     {



More information about the vlc-commits mailing list