summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: adf7f29)
raw | patch | inline | side by side (parent: adf7f29)
author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | |
Fri, 21 Nov 2003 21:34:26 +0000 (21:34 +0000) | ||
committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | |
Fri, 21 Nov 2003 21:34:26 +0000 (21:34 +0000) |
Original commit message from CVS:
Add C-based local matroska/EBML plugin, remove libmatroska/libebml c++ one
Add C-based local matroska/EBML plugin, remove libmatroska/libebml c++ one
configure.ac | patch | blob | history | |
ext/Makefile.am | patch | blob | history |
diff --git a/configure.ac b/configure.ac
index 37773bce42f1f24e37ef1d35a62ffef69f23e5f5..0b6e01f94210561419f22710bd82dd14877e46b7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
intfloat \
law \
level \
+ matroska \
median \
mixmatrix \
mpeg1sys \
])
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, [
gst/intfloat/Makefile
gst/law/Makefile
gst/level/Makefile
+gst/matroska/Makefile
gst/median/Makefile
gst/mixmatrix/Makefile
gst/mpeg1sys/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 d00a8c1425c9a3e9907803d44beeb7e2050d841a..ce036262dca9779d77710eb014eb1b1d4d5647bc 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
MAD_DIR=
endif
-if USE_MATROSKA
-MATROSKA_DIR=matroska
-else
-MATROSKA_DIR=
-endif
-
if USE_MIKMOD
MIKMOD_DIR=mikmod
else
$(LIBPNG_DIR) \
$(MAD_DIR) \
$(MAS_DIR) \
- $(MATROSKA_DIR) \
$(MIKMOD_DIR) \
$(MPEG2DEC_DIR) \
$(MPLEX_DIR) \
libfame \
libpng \
mad \
- matroska \
mikmod \
mpeg2dec \
mplex \