* modules/demux/mkv.cpp: support for libmatroska 0.5.0.

diff --git a/configure.ac b/configure.ac
index 488e26d14e6c4acbf40071f3f9285059552b2118..2dbd0a019d697dd9eee5b6d14a4607b1b66cda3a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.55 2003/08/10 21:26:07 gbazin Exp $
+dnl $Id: configure.ac,v 1.56 2003/08/12 08:19:20 sam Exp $
 
 AC_INIT(vlc,0.6.2)
 
@@ -1436,6 +1436,7 @@ AC_LANG_PUSH(C++)
   dnl matroska headers include ebml headers directly... pouah that stinks
   CPPFLAGS="${CPPFLAGS_save} -I/usr/local/include/ebml -I/usr/include/ebml"
   AC_CHECK_HEADERS(EbmlVersion.h matroska/KaxVersion.h, [
+    AC_CHECK_HEADERS(matroska/KaxAttachments.h)
     AX_ADD_PLUGINS([mkv])
     AX_ADD_CXXFLAGS([mkv],[-I/usr/local/include/ebml -I/usr/include/ebml])
     AC_CHECK_LIB(ebml_pic,main,[

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 09af1053890475579a80fff6e6015e9fd7256dee..6e287974334ed93d659551b8377185b7bfe68cf9 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -2,7 +2,7 @@
  * mkv.cpp : matroska demuxer
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: mkv.cpp,v 1.19 2003/08/10 14:21:15 gbazin Exp $
+ * $Id: mkv.cpp,v 1.20 2003/08/12 08:19:20 sam Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -53,7 +53,11 @@
 #include "ebml/EbmlVoid.h"
 
 #include "matroska/FileKax.h"
+#ifdef HAVE_MATROSKA_KAXATTACHMENTS_H
+#include "matroska/KaxAttachments.h"
+#else
 #include "matroska/KaxAttachements.h"
+#endif
 #include "matroska/KaxBlock.h"
 #include "matroska/KaxBlockData.h"
 #include "matroska/KaxChapters.h"
@@ -930,9 +934,13 @@ static int Activate( vlc_object_t * p_this )
             /* stop parsing the stream */
             break;
         }
+#ifdef HAVE_MATROSKA_KAXATTACHMENTS_H
+        else if( EbmlId( *el1 ) == KaxAttachments::ClassInfos.GlobalId )
+#else
         else if( EbmlId( *el1 ) == KaxAttachements::ClassInfos.GlobalId )
+#endif
         {
-            msg_Dbg( p_input, "|   + Attachements FIXME TODO (but probably never supported)" );
+            msg_Dbg( p_input, "|   + Attachments FIXME TODO (but probably never supported)" );
         }
         else if( EbmlId( *el1 ) == KaxChapters::ClassInfos.GlobalId )
         {