diff options
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | ext/Makefile.am | 17 |
3 files changed, 24 insertions, 5 deletions
diff --git a/common b/common -Subproject f12ad60f50de84a39e26901b3ac29c15c1bf954 +Subproject 74856703c922315f64b9314547966bd4963db96 diff --git a/configure.ac b/configure.ac index 80da6143..8f78d7bc 100644 --- a/configure.ac +++ b/configure.ac @@ -666,7 +666,7 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [ # prerelease and release should get it disted if test "x$GST_PLUGINS_VERSION_NANO" = x1; then 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) else 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) +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, [ @@ -1237,6 +1246,7 @@ ext/libfame/Makefile ext/libpng/Makefile ext/mad/Makefile ext/mas/Makefile +ext/matroska/Makefile ext/mikmod/Makefile ext/mpeg2dec/Makefile ext/pango/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 5d8940c7..84326325 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -166,6 +166,12 @@ else MAD_DIR= endif +if USE_MATROSKA +MATROSKA_DIR=matroska +else +MATROSKA_DIR= +endif + if USE_MIKMOD MIKMOD_DIR=mikmod else @@ -264,8 +270,9 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(HERMES_DIR) $(JACK_DIR) $(JPEG_DIR) \ $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) \ $(LIBDV_DIR) $(LIBFAME_DIR) $(LIBPNG_DIR) \ - $(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) $(PANGO_DIR) \ - $(RAW1394_DIR) $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ + $(MAD_DIR) $(MATROSKA_DIR) $(MIKMOD_DIR) \ + $(MPEG2DEC_DIR) $(PANGO_DIR) $(RAW1394_DIR) \ + $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ $(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \ $(VORBIS_DIR) $(XVID_DIR) $(SNAPSHOT_DIR) @@ -276,7 +283,9 @@ DIST_SUBDIRS=\ flac gdk_pixbuf gnomevfs gsm \ hermes ivorbis jack jpeg \ ladspa lame lcs libfame libpng \ - mad mikmod mpeg2dec pango raw1394 \ - sdl snapshot sndfile shout shout2 sidplay \ + mad matroska mikmod \ + mpeg2dec pango raw1394 \ + sdl snapshot sndfile \ + shout shout2 sidplay \ smoothwave swfdec tarkin vorbis \ xvid |