Skip to content

V
vlc-2-2
Commit 7be936ca authored by Steve Lhomme's avatar Steve Lhomme Committed by Jean-Baptiste Kempf
Browse files
Options

MKV: Multi tags don't exist anymore 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 197661eb
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
modules/demux/mkv/matroska_segment.cpp
View file @ 7be936ca
...@@ -267,6 +267,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags ) ...@@ -267,6 +267,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
{ {
if( MKV_IS_ID( el, KaxTagTargets ) ) if( MKV_IS_ID( el, KaxTagTargets ) )
PARSE_TAG( "Targets" ); PARSE_TAG( "Targets" );
#if 0 // not valid anymore
else if( MKV_IS_ID( el, KaxTagGeneral ) ) else if( MKV_IS_ID( el, KaxTagGeneral ) )
PARSE_TAG( "General" ); PARSE_TAG( "General" );
else if( MKV_IS_ID( el, KaxTagGenres ) ) else if( MKV_IS_ID( el, KaxTagGenres ) )
...@@ -303,6 +304,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags ) ...@@ -303,6 +304,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
{ {
msg_Dbg( &sys.demuxer, "| + Multi Title" ); msg_Dbg( &sys.demuxer, "| + Multi Title" );
} }
#endif
else if( MKV_IS_ID( el, KaxTagSimple ) ) else if( MKV_IS_ID( el, KaxTagSimple ) )
ParseSimpleTags( static_cast<KaxTagSimple*>( el ) ); ParseSimpleTags( static_cast<KaxTagSimple*>( el ) );
else else
......
modules/demux/mkv/mkv.hpp
View file @ 7be936ca
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
#include "matroska/KaxSegment.h" #include "matroska/KaxSegment.h"
#include "matroska/KaxTag.h" #include "matroska/KaxTag.h"
#include "matroska/KaxTags.h" #include "matroska/KaxTags.h"
#include "matroska/KaxTagMulti.h" //#include "matroska/KaxTagMulti.h"
#include "matroska/KaxTracks.h" #include "matroska/KaxTracks.h"
#include "matroska/KaxTrackAudio.h" #include "matroska/KaxTrackAudio.h"
#include "matroska/KaxTrackVideo.h" #include "matroska/KaxTrackVideo.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment