summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2001-12-23 13:20:08 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2001-12-23 13:20:08 +0000
commit8df7a03156fc8cbec3e855ca75cda04a72c769ae (patch)
tree97fb3040f358beb8d9e44b86f0ba193d231d4e33
parent3a29cb5864778cef78ce5dda6a24a3b44ba50186 (diff)
downloadgst-plugins-bad-8df7a03156fc8cbec3e855ca75cda04a72c769ae.tar.gz
gst-plugins-bad-8df7a03156fc8cbec3e855ca75cda04a72c769ae.tar.bz2
gst-plugins-bad-8df7a03156fc8cbec3e855ca75cda04a72c769ae.zip
adding festival
Original commit message from CVS: adding festival
-rw-r--r--configure.ac8
-rw-r--r--ext/Makefile.am10
2 files changed, 12 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index ea2ee538..329cc33c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,12 +287,12 @@ dnl ==========================================================================
GST_PLUGINS_ALL="\
ac3parse adder audioscale auparse avi chart\
- cutter deinterlace flx intfloat lav law level\
+ cutter deinterlace flx intfloat law level\
median mpeg1enc mpeg1sys mpeg2enc mpeg2sub\
mpegaudio mpegaudioparse mpegstream mpegtypes\
passthrough playondemand rtjpeg silence sine\
smooth smoothwave spectrum speed stereo stereomono\
- synaesthesia udp videoscale volenv volume vumeter wavparse"
+ synaesthesia udp videoscale volenv volume vumeter wavparse y4m"
GST_PLUGINS_ALL=""
@@ -1036,7 +1036,6 @@ gst/cutter/Makefile \
gst/deinterlace/Makefile \
gst/flx/Makefile \
gst/intfloat/Makefile \
-gst/lav/Makefile \
gst/law/Makefile \
gst/level/Makefile \
gst/median/Makefile \
@@ -1065,7 +1064,8 @@ gst/videoscale/Makefile \
gst/volenv/Makefile \
gst/volume/Makefile \
gst/vumeter/Makefile \
-gst/wavparse/Makefile"
+gst/wavparse/Makefile \
+gst/y4m/Makefile"
dnl $PLUGIN_GST_MAKEFILES
AC_OUTPUT(
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 8804878c..c53ea1bd 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -46,6 +46,12 @@ else
ESD_DIR=
endif
+if USE_FESTIVAL
+FESTIVAL_DIR=festival
+else
+FESTIVAL_DIR=
+endif
+
if USE_LAME
LAME_DIR=lame
else
@@ -78,8 +84,8 @@ endif
SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) \
$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DVDREAD_DIR) $(ESD_DIR) \
- $(LAME_DIR) $(MAD_DIR) $(MPEG2DEC_DIR) \
+ $(FESTIVAL_DIR) $(LAME_DIR) $(MAD_DIR) $(MPEG2DEC_DIR) \
$(SDL_DIR) $(VORBIS_DIR)
DIST_SUBDIRS=a52 aalib alsa avifile audiofile cdparanoia dvdread esd \
- lame mad mpeg2dec sdl vorbis
+ festival lame mad mpeg2dec sdl vorbis