Commit 2117ec9b authored by Ronald S. Bultje's avatar Ronald S. Bultje

Add C-based local matroska/EBML plugin, remove libmatroska/libebml c++ one

Original commit message from CVS:
Add C-based local matroska/EBML plugin, remove libmatroska/libebml c++ one
parent bd83e181
...@@ -287,6 +287,7 @@ GST_PLUGINS_ALL="\ ...@@ -287,6 +287,7 @@ GST_PLUGINS_ALL="\
intfloat \ intfloat \
law \ law \
level \ level \
matroska \
median \ median \
mixmatrix \ mixmatrix \
mpeg1sys \ mpeg1sys \
...@@ -956,15 +957,6 @@ GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [ ...@@ -956,15 +957,6 @@ GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
]) ])
AC_SUBST(MAD_LIBS) 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 *** dnl *** mikmod ***
translit(dnm, m, l) AM_CONDITIONAL(USE_MIKMOD, true) translit(dnm, m, l) AM_CONDITIONAL(USE_MIKMOD, true)
GST_CHECK_FEATURE(MIKMOD, [mikmod plug-in], mikmod, [ GST_CHECK_FEATURE(MIKMOD, [mikmod plug-in], mikmod, [
...@@ -1316,6 +1308,7 @@ gst/id3/Makefile ...@@ -1316,6 +1308,7 @@ gst/id3/Makefile
gst/intfloat/Makefile gst/intfloat/Makefile
gst/law/Makefile gst/law/Makefile
gst/level/Makefile gst/level/Makefile
gst/matroska/Makefile
gst/median/Makefile gst/median/Makefile
gst/mixmatrix/Makefile gst/mixmatrix/Makefile
gst/mpeg1sys/Makefile gst/mpeg1sys/Makefile
...@@ -1401,7 +1394,6 @@ ext/libfame/Makefile ...@@ -1401,7 +1394,6 @@ ext/libfame/Makefile
ext/libpng/Makefile ext/libpng/Makefile
ext/mad/Makefile ext/mad/Makefile
ext/mas/Makefile ext/mas/Makefile
ext/matroska/Makefile
ext/mikmod/Makefile ext/mikmod/Makefile
ext/mpeg2dec/Makefile ext/mpeg2dec/Makefile
ext/mplex/Makefile ext/mplex/Makefile
......
...@@ -172,12 +172,6 @@ else ...@@ -172,12 +172,6 @@ else
MAD_DIR= MAD_DIR=
endif endif
if USE_MATROSKA
MATROSKA_DIR=matroska
else
MATROSKA_DIR=
endif
if USE_MIKMOD if USE_MIKMOD
MIKMOD_DIR=mikmod MIKMOD_DIR=mikmod
else else
...@@ -309,7 +303,6 @@ SUBDIRS=\ ...@@ -309,7 +303,6 @@ SUBDIRS=\
$(LIBPNG_DIR) \ $(LIBPNG_DIR) \
$(MAD_DIR) \ $(MAD_DIR) \
$(MAS_DIR) \ $(MAS_DIR) \
$(MATROSKA_DIR) \
$(MIKMOD_DIR) \ $(MIKMOD_DIR) \
$(MPEG2DEC_DIR) \ $(MPEG2DEC_DIR) \
$(MPLEX_DIR) \ $(MPLEX_DIR) \
...@@ -357,7 +350,6 @@ DIST_SUBDIRS=\ ...@@ -357,7 +350,6 @@ DIST_SUBDIRS=\
libfame \ libfame \
libpng \ libpng \
mad \ mad \
matroska \
mikmod \ mikmod \
mpeg2dec \ mpeg2dec \
mplex \ mplex \
......
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