mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Add matroska support to the build tree

Browse source 
Original commit message from CVS:
Add matroska support to the build tree
This commit is contained in:
Ronald S. Bultje 2003-07-14 17:37:34 +00:00
parent 671171e4f0
commit 0efffb541e
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit f12ad60f50de84a39e26901b3ac29c15c1bf954e Subproject commit 74856703c922315f64b9314547966bd4963db968

12
configure.ac
View file

@ -666,7 +666,7 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
# prerelease and release should get it disted # prerelease and release should get it disted
if test "x$GST_PLUGINS_VERSION_NANO" = x1; then if test "x$GST_PLUGINS_VERSION_NANO" = x1; then
AC_MSG_NOTICE(slurping FFmpeg CVS source) AC_MSG_NOTICE(slurping FFmpeg CVS source)
AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2003-06-09 22:00 GMT, AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2003-07-05 22:00 GMT,
HAVE_FFMPEG=yes, HAVE_FFMPEG=no) HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
else else
AC_MSG_NOTICE(FFmpeg CVS code should be included already) AC_MSG_NOTICE(FFmpeg CVS code should be included already)
@ -832,6 +832,15 @@ 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, [
@ -1237,6 +1246,7 @@ 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/pango/Makefile ext/pango/Makefile

17
ext/Makefile.am
View file

@ -166,6 +166,12 @@ 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
@ -264,8 +270,9 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
$(HERMES_DIR) $(JACK_DIR) $(JPEG_DIR) \ $(HERMES_DIR) $(JACK_DIR) $(JPEG_DIR) \
$(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) \ $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) \
$(LIBDV_DIR) $(LIBFAME_DIR) $(LIBPNG_DIR) \ $(LIBDV_DIR) $(LIBFAME_DIR) $(LIBPNG_DIR) \
$(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) $(PANGO_DIR) \ $(MAD_DIR) $(MATROSKA_DIR) $(MIKMOD_DIR) \
$(RAW1394_DIR) $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ $(MPEG2DEC_DIR) $(PANGO_DIR) $(RAW1394_DIR) \
$(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
$(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \ $(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \
$(VORBIS_DIR) $(XVID_DIR) $(SNAPSHOT_DIR) $(VORBIS_DIR) $(XVID_DIR) $(SNAPSHOT_DIR)
@ -276,7 +283,9 @@ DIST_SUBDIRS=\
flac gdk_pixbuf gnomevfs gsm \ flac gdk_pixbuf gnomevfs gsm \
hermes ivorbis jack jpeg \ hermes ivorbis jack jpeg \
ladspa lame lcs libfame libpng \ ladspa lame lcs libfame libpng \
mad mikmod mpeg2dec pango raw1394 \ mad matroska mikmod \
sdl snapshot sndfile shout shout2 sidplay \ mpeg2dec pango raw1394 \
sdl snapshot sndfile \
shout shout2 sidplay \
smoothwave swfdec tarkin vorbis \ smoothwave swfdec tarkin vorbis \
xvid xvid