Index: modules/demux/mkv/mkv.hpp
===================================================================
--- modules/demux/mkv/mkv.hpp	2012-08-10 13:14:35.284287024 +0200
+++ modules/demux/mkv/mkv.hpp	2012-08-10 13:15:13.839249260 +0200
@@ -115,7 +115,7 @@
 
 #define MKVD_TIMECODESCALE 1000000
 
-#define MKV_IS_ID( el, C ) ( el != NULL && typeid( *el ) == typeid( C ) )
+#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId )
 
 
 using namespace LIBMATROSKA_NAMESPACE;