* configure.ac, modules/demux/Modules.am: matroska configure detection (disabled by default).
Due to the way matroska headers directly reference ebml headers, you'll have to configure like this:
CPPFLAGS=-I/usr/local/include/ebml ./configure --enable-mkv

configure.ac

@@ -1453,7 +1453,7 @@ then
 fi
 
 dnl
-dnl  ogg plugin
+dnl  ogg demux plugin
 dnl
 AC_ARG_ENABLE(ogg,
   [  --enable-ogg            Ogg demux support (default enabled)])
@@ -1468,6 +1468,22 @@ then
    ],[])
 fi
 
+dnl
+dnl  matroska demux plugin
+dnl
+AC_ARG_ENABLE(mkv,
+  [  --enable-mkv            Matroska demux support (default disabled)])
+if test "${enable_mkv}" = "yes"
+then
+AC_LANG_PUSH(C++)
+  dnl matroska headers include ebml headers directly... pouah that stinks
+  AC_CHECK_HEADERS(EbmlVersion.h matroska/KaxVersion.h, [
+    PLUGINS="${PLUGINS} mkv"
+    LDFLAGS_mkv="${LDFLAGS_mkv} -lmatroska -lebml -lstdc++"
+   ],[])
+AC_LANG_POP(C++)
+fi
+
 dnl
 dnl  Codec plugins
 dnl

modules/demux/Modules.am

@@ -5,3 +5,4 @@ SOURCES_m3u = modules/demux/m3u.c
 SOURCES_demuxdump = modules/demux/demuxdump.c
 SOURCES_rawdv = modules/demux/rawdv.c
 SOURCES_au = modules/demux/au.c
+SOURCES_mkv = modules/demux/mkv.cpp