MKV: Multi tags don't exist anymore

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

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index 2856b9347e574198954ba3e4dd0b11cd5d471cac..fac4f45365a54bdf8e978a961214174d1a2f8e91 100644 (file)
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -267,6 +267,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
             {
                 if( MKV_IS_ID( el, KaxTagTargets ) )
                     PARSE_TAG( "Targets" );
+#if 0 // not valid anymore
                 else if( MKV_IS_ID( el, KaxTagGeneral ) )
                     PARSE_TAG( "General" );
                 else if( MKV_IS_ID( el, KaxTagGenres ) )
@@ -303,6 +304,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
                 {
                     msg_Dbg( &sys.demuxer, "|   + Multi Title" );
                 }
+#endif
                 else if( MKV_IS_ID( el, KaxTagSimple ) )
                     ParseSimpleTags( static_cast<KaxTagSimple*>( el ) );
                 else

diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
index 664cafac21a05489e77669453d21649a860a11a3..c7b6194be37353eed3a39d5482e6b4cb87e340be 100644 (file)
--- a/modules/demux/mkv/mkv.hpp
+++ b/modules/demux/mkv/mkv.hpp
@@ -86,7 +86,7 @@
 #include "matroska/KaxSegment.h"
 #include "matroska/KaxTag.h"
 #include "matroska/KaxTags.h"
-#include "matroska/KaxTagMulti.h"
+//#include "matroska/KaxTagMulti.h"
 #include "matroska/KaxTracks.h"
 #include "matroska/KaxTrackAudio.h"
 #include "matroska/KaxTrackVideo.h"