[vlc-commits] Mkv: use MKV_IS_ID and avoid EbmlId() operator use

Jean-Baptiste Kempf git at videolan.org
Sun Jan 30 20:44:26 CET 2011


vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jan 30 20:42:25 2011 +0100| [9fcf9eff732da87be7f9407895e8afd5c960973a] | committer: Jean-Baptiste Kempf

Mkv: use MKV_IS_ID and avoid EbmlId() operator use

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

 modules/demux/mkv/demux.cpp                  |    2 +-
 modules/demux/mkv/matroska_segment_parse.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index dfa1ca6..accea1b 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -94,7 +94,7 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlS
 
     while (p_l0 != 0)
     {
-        if (EbmlId(*p_l0) == KaxSegment::ClassInfos.GlobalId)
+        if ( MKV_IS_ID( p_l0, KaxSegment) )
         {
             EbmlParser  *ep;
             matroska_segment_c *p_segment1 = new matroska_segment_c( *this, *p_estream );
diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index f2d7df2..27bbc0e 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -539,7 +539,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
                     tk->f_fps = float( vfps );
                     msg_Dbg( &sys.demuxer, "   |   |   |   + fps=%f", float( vfps ) );
                 }
-                else if( EbmlId( *l ) == KaxVideoDisplayUnit::ClassInfos.GlobalId )
+                else if( MKV_IS_ID( l, KaxVideoDisplayUnit ) )
                 {
                     KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)l;
 



More information about the vlc-commits mailing list