Skip to content

GitLab

gst-plugins-bad
gst-plugins-bad
Commit a9e84f1e authored by Thomas Vander Stichele's avatar Thomas Vander Stichele
Browse files
Options

all these plugins are moved to gst-plugins-good 

Original commit message from CVS:
all these plugins are moved to gst-plugins-good
parent a6ba4792
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 359 deletions
ChangeLog
View file @ a9e84f1e
2005-08-30 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac:
* ext/Makefile.am:
* ext/aalib/Makefile.am:
* ext/aalib/gstaasink.c:
* ext/aalib/gstaasink.h:
* ext/cairo/Makefile.am:
* ext/cairo/gstcairo.c:
* ext/cairo/gsttextoverlay.c:
* ext/cairo/gsttextoverlay.h:
* ext/cairo/gsttimeoverlay.c:
* ext/cairo/gsttimeoverlay.h:
* ext/dv/Makefile.am:
* ext/dv/NOTES:
* ext/dv/demo-play.c:
* ext/dv/gstdv.c:
* ext/dv/gstdvdec.c:
* ext/dv/gstdvdec.h:
* ext/dv/gstdvdemux.c:
* ext/dv/gstdvdemux.h:
* ext/esd/Makefile.am:
* ext/esd/README:
* ext/esd/esdmon.c:
* ext/esd/esdmon.h:
* ext/esd/esdsink.c:
* ext/esd/esdsink.h:
* ext/esd/gstesd.c:
* ext/flac/Makefile.am:
* ext/flac/flac_compat.h:
* ext/flac/gstflac.c:
* ext/flac/gstflacdec.c:
* ext/flac/gstflacdec.h:
* ext/flac/gstflacenc.c:
* ext/flac/gstflacenc.h:
* ext/flac/gstflactag.c:
* ext/flac/gstflactag.h:
* ext/gconf/Makefile.am:
* ext/gconf/gconf.c:
* ext/gconf/gconf.h:
* ext/gconf/gstgconfaudiosink.c:
* ext/gconf/gstgconfaudiosink.h:
* ext/gconf/gstgconfelements.c:
* ext/gconf/gstgconfelements.h:
* ext/gconf/gstgconfvideosink.c:
* ext/gconf/gstgconfvideosink.h:
* ext/gdk_pixbuf/Makefile.am:
* ext/gdk_pixbuf/gst_loader.c:
* ext/gdk_pixbuf/gstgdkanimation.c:
* ext/gdk_pixbuf/gstgdkanimation.h:
* ext/gdk_pixbuf/gstgdkpixbuf.c:
* ext/gdk_pixbuf/gstgdkpixbuf.h:
* ext/gdk_pixbuf/pixbufscale.c:
* ext/gdk_pixbuf/pixbufscale.h:
* ext/jpeg/Makefile.am:
* ext/jpeg/README:
* ext/jpeg/gstjpeg.c:
* ext/jpeg/gstjpegdec.c:
* ext/jpeg/gstjpegdec.h:
* ext/jpeg/gstjpegenc.c:
* ext/jpeg/gstjpegenc.h:
* ext/jpeg/gstsmokedec.c:
* ext/jpeg/gstsmokedec.h:
* ext/jpeg/gstsmokeenc.c:
* ext/jpeg/gstsmokeenc.h:
* ext/jpeg/smokecodec.c:
* ext/jpeg/smokecodec.h:
* ext/jpeg/smokeformat.h:
* ext/ladspa/Makefile.am:
* ext/ladspa/gstladspa.c:
* ext/ladspa/gstladspa.h:
* ext/ladspa/gstsignalprocessor.c:
* ext/ladspa/gstsignalprocessor.h:
* ext/ladspa/load.c:
* ext/ladspa/search.c:
* ext/ladspa/utils.h:
* ext/libcaca/Makefile.am:
* ext/libcaca/gstcacasink.c:
* ext/libcaca/gstcacasink.h:
* ext/libmng/Makefile.am:
* ext/libmng/gstmng.c:
* ext/libmng/gstmng.h:
* ext/libmng/gstmngdec.c:
* ext/libmng/gstmngdec.h:
* ext/libmng/gstmngenc.c:
* ext/libmng/gstmngenc.h:
* ext/libpng/Makefile.am:
* ext/libpng/gstpng.c:
* ext/libpng/gstpng.h:
* ext/libpng/gstpngdec.c:
* ext/libpng/gstpngdec.h:
* ext/libpng/gstpngenc.c:
* ext/libpng/gstpngenc.h:
* ext/mikmod/Makefile.am:
* ext/mikmod/README:
* ext/mikmod/drv_gst.c:
* ext/mikmod/gstmikmod.c:
* ext/mikmod/gstmikmod.h:
* ext/mikmod/mikmod_reader.c:
* ext/mikmod/mikmod_types.c:
* ext/mikmod/mikmod_types.h:
* ext/pango/Makefile.am:
* ext/pango/gsttextoverlay.c:
* ext/pango/gsttextoverlay.h:
* ext/pango/gsttimeoverlay.c:
* ext/pango/gsttimeoverlay.h:
* ext/raw1394/Makefile.am:
* ext/raw1394/gst1394.c:
* ext/raw1394/gstdv1394src.c:
* ext/raw1394/gstdv1394src.h:
* ext/shout2/Makefile.am:
* ext/shout2/gstshout2.c:
* ext/shout2/gstshout2.h:
* ext/speex/Makefile.am:
* ext/speex/gstspeex.c:
* ext/speex/gstspeexdec.c:
* ext/speex/gstspeexdec.h:
* ext/speex/gstspeexenc.c:
* ext/speex/gstspeexenc.h:
* gst/avi/.cvsignore:
* gst/avi/Makefile.am:
* gst/avi/README:
* gst/avi/avi-ids.h:
* gst/avi/avi.vcproj:
* gst/avi/gstavi.c:
* gst/avi/gstavidemux.c:
* gst/avi/gstavidemux.h:
* gst/avi/gstavimux.c:
* gst/avi/gstavimux.h:
* gst/level/gstlevel.c: (gst_level_transform):
* sys/Makefile.am:
* sys/oss/.cvsignore:
* sys/oss/Makefile.am:
* sys/oss/gst-i18n-plugin.h:
* sys/oss/gstossaudio.c:
* sys/oss/gstossdmabuffer.c:
* sys/oss/gstossdmabuffer.h:
* sys/oss/gstosshelper.c:
* sys/oss/gstosshelper.h:
* sys/oss/gstossmixer.c:
* sys/oss/gstossmixer.h:
* sys/oss/gstossmixerelement.c:
* sys/oss/gstossmixerelement.h:
* sys/oss/gstossmixertrack.c:
* sys/oss/gstossmixertrack.h:
* sys/oss/gstosssink.c:
* sys/oss/gstosssink.h:
* sys/oss/gstosssrc.c:
* sys/oss/gstosssrc.h:
* sys/oss/oss_probe.c:
* sys/osxaudio/Makefile.am:
* sys/osxaudio/gstosxaudio.c:
* sys/osxaudio/gstosxaudioelement.c:
* sys/osxaudio/gstosxaudioelement.h:
* sys/osxaudio/gstosxaudiosink.c:
* sys/osxaudio/gstosxaudiosink.h:
* sys/osxaudio/gstosxaudiosrc.c:
* sys/osxaudio/gstosxaudiosrc.h:
* sys/osxvideo/Makefile.am:
* sys/osxvideo/cocoawindow.h:
* sys/osxvideo/cocoawindow.m:
* sys/osxvideo/osxvideosink.h:
* sys/osxvideo/osxvideosink.m:
all these plugins are moved to gst-plugins-good
2005-08-28 Flavio Oliveira <flavio.oliveira@indt.org.br>
* gst/wavenc/gstwavenc.c: Ported to GStreamer 0.9.
......
configure.ac
View file @ a9e84f1e
......@@ -285,26 +285,17 @@ AC_SUBST(GST_PLUGIN_LDFLAGS)
dnl these are all the gst plug-ins, compilable without additional libs
GST_PLUGINS_ALL="\
videofilter \
alpha \
autodetect \
avi \
effectv \
fdsrc \
goom \
law \
level \
mpegaudioparse \
qtdemux \
realmedia \
rtp \
rtsp \
smpte \
silence \
<<<<<<< configure.ac
=======
udp \
videobox \
wavenc \
wavparse \
>>>>>>> 1.580
mpegaudioparse \
"
......@@ -363,13 +354,6 @@ dnl ###########################
dnl # Configure external libs #
dnl ###########################
dnl *** aalib ***
translit(dnm, m, l) AM_CONDITIONAL(USE_AALIB, true)
GST_CHECK_FEATURE(AALIB, [aasink plug-in], aasink, [
AM_PATH_AALIB(, HAVE_AALIB=yes, HAVE_AALIB=no)
AS_SCRUB_INCLUDE(AALIB_CFLAGS)
])
dnl *** AMR-NB ***
translit(dnm, m, l) AM_CONDITIONAL(USE_AMRNB, true)
GST_CHECK_FEATURE(AMRNB, [AMR-NB], amrnbdec amrnbenc, [
......@@ -380,19 +364,6 @@ GST_CHECK_FEATURE(AMRNB, [AMR-NB], amrnbdec amrnbenc, [
AC_SUBST(AMRNB_LIBS))
])
dnl **** ESound ****
translit(dnm, m, l) AM_CONDITIONAL(USE_ESD, true)
GST_CHECK_FEATURE(ESD, [esound plug-ins], esdsink, [
PKG_CHECK_MODULES(ESD, esound >= 0.2.12, [
HAVE_ESD="yes"
AC_SUBST(ESD_CFLAGS)
AC_SUBST(ESD_LIBS)
], [
AM_PATH_ESD(0.2.12, HAVE_ESD="yes", HAVE_ESD="no")
AS_SCRUB_INCLUDE(ESD_CFLAGS)
])
])
dnl **** Free AAC Decoder (FAAD) ****
translit(dnm, m, l) AM_CONDITIONAL(USE_FAAD, true)
GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
......@@ -426,47 +397,6 @@ return 0;
AC_SUBST(FAAD_LIBS)
])
dnl *** FLAC ***
translit(dnm, m, l) AM_CONDITIONAL(USE_FLAC, true)
GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flacenc flacdec, [
GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__seekable_stream_encoder_new, -lm, FLAC/all.h, FLAC_LIBS="-lFLAC -lm")
dnl API change in FLAC 1.1.1, so require that...
if test x$HAVE_FLAC = xyes; then
AC_CHECK_DECL(FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR,
HAVE_FLAC="yes", HAVE_FLAC="no", [
#include <FLAC/seekable_stream_encoder.h>
])
fi
AC_SUBST(FLAC_LIBS)
])
dnl *** jpeg ***
dnl FIXME: we could use header checks here as well IMO
translit(dnm, m, l) AM_CONDITIONAL(USE_JPEG, true)
GST_CHECK_FEATURE(JPEG, [jpeg], jpegenc jpegdec, [
AC_ARG_WITH(jpeg-mmx,
[ --with-jpeg-mmx, path to MMX'ified JPEG library])
OLD_LIBS="$LIBS"
if test x$with_jpeg_mmx != x; then
LIBS="$LIBS -L$with_jpeg_mmx"
fi
AC_CHECK_LIB(jpeg-mmx, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
JPEG_LIBS="$LIBS -ljpeg-mmx"
LIBS="$OLD_LIBS"
if test x$HAVE_JPEG != xyes; then
AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
JPEG_LIBS="-ljpeg"
fi
AC_SUBST(JPEG_LIBS)
])
dnl *** ladspa ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LADSPA, true)
GST_CHECK_FEATURE(LADSPA, [ladspa], ladspa, [
AC_CHECK_HEADER(ladspa.h, HAVE_LADSPA="yes", HAVE_LADSPA="no")
])
dnl *** lame ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LAME, true)
GST_CHECK_FEATURE(LAME, [lame mp3 encoder library], lame, [
......@@ -492,30 +422,6 @@ int main (int argc, char *argv[])
])
])
dnl *** libcaca ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true)
GST_CHECK_FEATURE(LIBCACA, [libcaca], libcaca, [
GST_CHECK_CONFIGPROG(LIBCACA, caca-config)
AC_SUBST(LIBCACA_CFLAGS)
AC_SUBST(LIBCACA_LIBS)
])
dnl *** libdv ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDV, true)
GST_CHECK_FEATURE(LIBDV, [libdv DV/video decoder], dvdec, [
PKG_CHECK_MODULES(LIBDV, libdv >= 0.100, HAVE_LIBDV="yes", HAVE_LIBDV="no")
AC_SUBST(LIBDV_CFLAGS)
AC_SUBST(LIBDV_LIBS)
])
dnl *** libpng ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBPNG, true)
GST_CHECK_FEATURE(LIBPNG, [libpng PNG encoder], pngenc, [
PKG_CHECK_MODULES(LIBPNG, libpng12, HAVE_LIBPNG="yes", HAVE_LIBPNG="no")
AC_SUBST(LIBPNG_CFLAGS)
AC_SUBST(LIBPNG_LIBS)
])
dnl *** mad ***
dnl FIXME: we could use header checks here as well IMO
translit(dnm, m, l) AM_CONDITIONAL(USE_MAD, true)
......@@ -545,32 +451,6 @@ GST_CHECK_FEATURE(MPEG2DEC, [mpeg2dec], mpeg2dec, [
AC_SUBST(MPEG2DEC_LIBS)
])
dnl *** dv1394 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DV1394, true)
GST_CHECK_FEATURE(DV1394, [raw1394 and avc1394 library], dv1394src, [
dnl we need to test three headers and three libs
GST_CHECK_LIBHEADER(RAW1394,
raw1394, raw1394_new_handle,,
libraw1394/raw1394.h, RAW1394_LIBS="-lraw1394")
GST_CHECK_LIBHEADER(AVC1394,
avc1394, avc1394_send_command, $RAW1394_LIBS,
libavc1394/avc1394.h, AVC1394_LIBS="-lavc1394")
GST_CHECK_LIBHEADER(ROM1394,
rom1394, rom1394_free_directory, $RAW1394_LIBS,
libavc1394/rom1394.h, ROM1394_LIBS="-lrom1394")
dnl now see how far we got
if test x$HAVE_RAW1394 = xyes && \
test x$HAVE_AVC1394 = xyes && \
test x$HAVE_ROM1394 = xyes; then
HAVE_DV1394=yes
DV1394_LIBS="$RAW1394_LIBS $AVC1394_LIBS $ROM1394_LIBS"
AC_SUBST(DV1394_LIBS)
else
HAVE_DV1394=no
fi
])
dnl *** shout2 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT2, true)
GST_CHECK_FEATURE(SHOUT2, [shout2 plug-in], shout2send, [
......@@ -591,51 +471,6 @@ GST_CHECK_FEATURE(SIDPLAY, [sidplay plug-in], sidplay, [
GST_PATH_SIDPLAY()
])
dnl *** speex >= 1.0.4 or >= 1.1.5 ***
dnl 1.1.4 and earlier were not API/ABI compatible with 1.0
dnl 1.1.6 is the first to use a .pc/pkg-config file ***
dnl speex_jitter.h is 1.1.x only
translit(dnm, m, l) AM_CONDITIONAL(USE_SPEEX, true)
GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [
PKG_CHECK_MODULES(SPEEX, speex >= 1.1.6, [
HAVE_SPEEX="yes"
AC_SUBST(SPEEX_CFLAGS)
AC_SUBST(SPEEX_LIBS)
], [
GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex/speex.h, [
AC_CHECK_HEADER(speex/speex_jitter.h, [
dnl speex 1.1.x :
GST_CHECK_LIBHEADER(SPEEX, speex, speex_encode_int, , speex/speex.h, [
dnl speex 1.1.5 or + :
HAVE_SPEEX="yes"
SPEEX_LIBS="-lspeex"
AC_SUBST(SPEEX_CFLAGS)
AC_SUBST(SPEEX_LIBS)
],[
HAVE_SPEEX="no"
])
],[
dnl speex 1.0.x :
AC_CHECK_DECL(SPEEX_GET_LOOKAHEAD, [
dnl speex 1.0.4
HAVE_SPEEX="yes"
SPEEX_LIBS="-lspeex"
AC_SUBST(SPEEX_CFLAGS)
AC_SUBST(SPEEX_LIBS)
AC_DEFINE_UNQUOTED(SPEEX_1_0, 1,
[defined if speex 1.0.x API detected])
],[
HAVE_SPEEX="no"
AC_MSG_NOTICE(You need at least 1.0.4 to compile the speex plugin)
], [
#include <speex/speex.h>
])
])
])
])
])
dnl also add builddir include for enumtypes and marshal
GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_ERROR"
......@@ -691,49 +526,21 @@ AC_CONFIG_FILES(
Makefile
gst-plugins.spec
gst/Makefile
gst/alpha/Makefile
gst/autodetect/Makefile
gst/avi/Makefile
gst/effectv/Makefile
gst/fdsrc/Makefile
gst/goom/Makefile
gst/law/Makefile
gst/level/Makefile
gst/mpegaudioparse/Makefile
gst/qtdemux/Makefile
gst/realmedia/Makefile
gst/rtp/Makefile
gst/rtsp/Makefile
gst/smpte/Makefile
gst/silence/Makefile
gst/udp/Makefile
gst/videobox/Makefile
gst/videofilter/Makefile
ext/jpeg/Makefile
gst/qtdemux/Makefile
gst/wavenc/Makefile
gst/wavparse/Makefile
gst-libs/Makefile
gst-libs/gst/Makefile
sys/Makefile
sys/oss/Makefile
ext/Makefile
ext/aalib/Makefile
ext/dv/Makefile
ext/flac/Makefile
ext/gconf/Makefile
ext/ladspa/Makefile
ext/amrnb/Makefile
ext/faad/Makefile
ext/lame/Makefile
ext/libcaca/Makefile
ext/libpng/Makefile
ext/mad/Makefile
ext/raw1394/Makefile
ext/shout2/Makefile
ext/sidplay/Makefile
ext/speex/Makefile
ext/esd/Makefile
ext/mpeg2dec/Makefile
ext/faad/Makefile
ext/amrnb/Makefile
ext/sidplay/Makefile
gst-libs/Makefile
gst-libs/gst/Makefile
po/Makefile.in
common/Makefile
common/m4/Makefile
......
ext/Makefile.am
View file @ a9e84f1e
......@@ -4,12 +4,6 @@
A52DEC_DIR=
# endif
if USE_AALIB
AALIB_DIR=aalib
else
AALIB_DIR=
endif
if USE_AMRNB
AMRNB_DIR=amrnb
else
......@@ -40,12 +34,6 @@ AUDIOFILE_DIR=
AUDIORESAMPLE_DIR=
# endif
# if USE_CAIRO
# CAIRO_DIR=cairo
# else
CAIRO_DIR=
# endif
# if USE_CDAUDIO
# CDAUDIO_DIR=cdaudio
# else
......@@ -94,12 +82,6 @@ DVDREAD_DIR=
DVDNAV_DIR=
# endif
if USE_ESD
ESD_DIR=esd
else
ESD_DIR=
endif
# if USE_FAAC
# FAAC_DIR=faac
# else
......@@ -118,30 +100,6 @@ endif
## FESTIVAL_DIR=
## endif
if USE_FLAC
FLAC_DIR=flac
else
FLAC_DIR=
endif
if USE_GCONF
GCONF_DIR=gconf
else
GCONF_DIR=
endif
# if USE_GDK_PIXBUF
# GDK_PIXBUF_DIR=gdk_pixbuf
# else
GDK_PIXBUF_DIR=
# endif
# if USE_GNOME_VFS
# GNOMEVFS_DIR=gnomevfs
# else
GNOMEVFS_DIR=
# endif
# if USE_GSM
# GSM_DIR=gsm
# else
......@@ -160,18 +118,6 @@ HERMES_DIR=
JACK_DIR=
# endif
if USE_JPEG
JPEG_DIR=jpeg
else
JPEG_DIR=
endif
# if USE_LADSPA
# LADSPA_DIR=ladspa
# else
LADSPA_DIR=
# endif
if USE_LAME
LAME_DIR=lame
else
......@@ -184,36 +130,12 @@ endif
LCS_DIR=
# endif
if USE_LIBCACA
LIBCACA_DIR=libcaca
else
LIBCACA_DIR=
endif
if USE_LIBDV
LIBDV_DIR=dv
else
LIBDV_DIR=
endif
# if USE_LIBFAME
# LIBFAME_DIR=libfame
# else
LIBFAME_DIR=
# endif
# if USE_LIBMNG
# LIBMNG_DIR=libmng
# else
LIBMNG_DIR=
# endif
if USE_LIBPNG
LIBPNG_DIR=libpng
else
LIBPNG_DIR=
endif
# if USE_POLYP
# POLYP_DIR=polyp
# else
......@@ -238,12 +160,6 @@ else
MAD_DIR=
endif
# if USE_MIKMOD
# MIKMOD_DIR=mikmod
# else
MIKMOD_DIR=
# endif
if USE_MPEG2DEC
MPEG2DEC_DIR=mpeg2dec
else
......@@ -286,18 +202,6 @@ MUSICBRAINZ_DIR=
NAS_DIR=
# endif
# if USE_PANGO
# PANGO_DIR=pango
# else
PANGO_DIR=
# endif
if USE_DV1394
DV1394_DIR=raw1394
else
DV1394_DIR=
endif
# if USE_SDL
# SDL_DIR=sdl
# else
......@@ -310,12 +214,6 @@ SDL_DIR=
SHOUT_DIR=
# endif
if USE_SHOUT2
SHOUT2_DIR=shout2
else
SHOUT2_DIR=
endif
if USE_SIDPLAY
SIDPLAY_DIR=sidplay
else
......@@ -364,12 +262,6 @@ XVID_DIR=
SNAPSHOT_DIR=
# endif
if USE_SPEEX
SPEEX_DIR=speex
else
SPEEX_DIR=
endif
# if USE_XINE
# XINE_DIR=xine
# else
......@@ -378,61 +270,43 @@ XINE_DIR=
SUBDIRS=\
$(A52DEC_DIR) \
$(AALIB_DIR) \
$(AMRNB_DIR) \
$(ARTS_DIR) \
$(ARTSC_DIR) \
$(AUDIOFILE_DIR) \
$(AUDIORESAMPLE_DIR) \
$(CAIRO_DIR) \
$(CDAUDIO_DIR) \
$(CDPARANOIA_DIR) \
$(DIRAC_DIR) \
$(DIRECTFB_DIR) \
$(DIVX_DIR) \
$(DTS_DIR) \
$(DV1394_DIR) \
$(DVDREAD_DIR) \
$(DVDNAV_DIR) \
$(ESD_DIR) \
$(NAS_DIR) \
$(FAAC_DIR) \
$(FAAD_DIR) \
$(FLAC_DIR) \
$(GCONF_DIR) \
$(GDK_PIXBUF_DIR) \
$(GNOMEVFS_DIR) \
$(GSM_DIR) \
$(HERMES_DIR) \
$(LIBMMS_DIR) \
$(JACK_DIR) \
$(JPEG_DIR) \
$(LADSPA_DIR) \
$(LAME_DIR) \
$(LCS_DIR) \
$(LIBCACA_DIR) \
$(LIBDV_DIR) \
$(LIBFAME_DIR) \
$(LIBMNG_DIR) \
$(LIBPNG_DIR) \
$(LIBVISUAL_DIR) \
$(MAD_DIR) \
$(MIKMOD_DIR) \
$(MPEG2DEC_DIR) \
$(MPEG2ENC_DIR) \
$(MPLEX_DIR) \
$(MUSEPACK_DIR) \
$(MUSICBRAINZ_DIR) \
$(PANGO_DIR) \
$(POLYP_DIR) \
$(SDL_DIR) \
$(SHOUT_DIR) \
$(SHOUT2_DIR) \
$(SIDPLAY_DIR) \
$(SMOOTHWAVE_DIR) \
$(SNAPSHOT_DIR) \
$(SNDFILE_DIR) \
$(SPEEX_DIR) \
$(SWFDEC_DIR) \
$(TARKIN_DIR) \
$(IVORBIS_DIR) \
......@@ -440,21 +314,9 @@ SUBDIRS=\
$(XVID_DIR)
DIST_SUBDIRS=\
aalib \
amrnb \
esd \
dv \
faad \
flac \