fix filename self-references
[vlc.git] / modules / demux / mkv / matroska_segment_parse.cpp
index 616c312..1a5ec21 100644 (file)
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * mkv.cpp : matroska demuxer
+ * matroska_segment_parse.cpp : matroska demuxer
  *****************************************************************************
  * Copyright (C) 2003-2010 the VideoLAN team
  * $Id$
@@ -28,6 +28,8 @@
 
 #include "demux.hpp"
 
+#include "Ebml_parser.hpp"
+
 /*****************************************************************************
  * Some functions to manipulate memory
  *****************************************************************************/
@@ -863,7 +865,13 @@ void matroska_segment_c::ParseChapterAtom( int i_level, KaxChapterAtom *ca, chap
         else if( MKV_IS_ID( l, KaxChapterSegmentEditionUID ) )
         {
             chapters.p_segment_edition_uid = new KaxChapterSegmentEditionUID( *static_cast<KaxChapterSegmentEditionUID*>(l) );
-            msg_Dbg( &sys.demuxer, "|   |   |   |   + ChapterSegmentEditionUID= %u", *(uint32*)chapters.p_segment_edition_uid->GetBuffer() );
+            msg_Dbg( &sys.demuxer, "|   |   |   |   + ChapterSegmentEditionUID= %u",
+#if LIBMATROSKA_VERSION < 0x010300
+            *(uint32*)chapters.p_segment_edition_uid->GetBuffer()
+#else
+            *(uint32*)chapters.p_segment_edition_uid
+#endif
+            );
         }
         else if( MKV_IS_ID( l, KaxChapterTimeStart ) )
         {
@@ -987,6 +995,8 @@ void matroska_segment_c::ParseAttachments( KaxAttachments *attachments )
                                                         GetChild<KaxMimeType>( *attachedFile ),
                                                         img_data.GetSize() );
 
+        msg_Dbg( &sys.demuxer, "|   |   - %s (%s)", new_attachment->fileName(), new_attachment->mimeType() );
+
         if( new_attachment->init() )
         {
              memcpy( new_attachment->p_data, img_data.GetBuffer(), img_data.GetSize() );