summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac12
-rw-r--r--ext/Makefile.am8
2 files changed, 2 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac
index 37773bce..0b6e01f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,6 +287,7 @@ GST_PLUGINS_ALL="\
intfloat \
law \
level \
+ matroska \
median \
mixmatrix \
mpeg1sys \
@@ -956,15 +957,6 @@ GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
])
AC_SUBST(MAD_LIBS)
-dnl *** matroska ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_MATROSKA, true)
-GST_CHECK_FEATURE(MATROSKA, [matroska muxer/demuxer], matroska muxer/demuxer, [
- PATH_EBML([HAVE_MATROSKA=yes], [HAVE_MATROSKA=no])
- if test x$HAVE_MATROSKA = xyes; then
- PATH_MATROSKA(0.4.4, [HAVE_MATROSKA=yes], [HAVE_MATROSKA=no])
- fi
-])
-
dnl *** mikmod ***
translit(dnm, m, l) AM_CONDITIONAL(USE_MIKMOD, true)
GST_CHECK_FEATURE(MIKMOD, [mikmod plug-in], mikmod, [
@@ -1316,6 +1308,7 @@ gst/id3/Makefile
gst/intfloat/Makefile
gst/law/Makefile
gst/level/Makefile
+gst/matroska/Makefile
gst/median/Makefile
gst/mixmatrix/Makefile
gst/mpeg1sys/Makefile
@@ -1401,7 +1394,6 @@ ext/libfame/Makefile
ext/libpng/Makefile
ext/mad/Makefile
ext/mas/Makefile
-ext/matroska/Makefile
ext/mikmod/Makefile
ext/mpeg2dec/Makefile
ext/mplex/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index d00a8c14..ce036262 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -172,12 +172,6 @@ else
MAD_DIR=
endif
-if USE_MATROSKA
-MATROSKA_DIR=matroska
-else
-MATROSKA_DIR=
-endif
-
if USE_MIKMOD
MIKMOD_DIR=mikmod
else
@@ -309,7 +303,6 @@ SUBDIRS=\
$(LIBPNG_DIR) \
$(MAD_DIR) \
$(MAS_DIR) \
- $(MATROSKA_DIR) \
$(MIKMOD_DIR) \
$(MPEG2DEC_DIR) \
$(MPLEX_DIR) \
@@ -357,7 +350,6 @@ DIST_SUBDIRS=\
libfame \
libpng \
mad \
- matroska \
mikmod \
mpeg2dec \
mplex \