Commit 9cd192e3 authored by Gildas Bazin's avatar Gildas Bazin

* 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
parent 0fb99cd5
......@@ -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
......
......@@ -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
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