Commit dc8fe5e7 authored by Christian Schaller's avatar Christian Schaller

merge integer based Tremor vorbis plugin

Original commit message from CVS:
merge integer based Tremor vorbis plugin
parent 637c1a07
...@@ -601,6 +601,22 @@ GST_CHECK_FEATURE(HTTP, [http plug-ins], gsthttpsrc, [ ...@@ -601,6 +601,22 @@ GST_CHECK_FEATURE(HTTP, [http plug-ins], gsthttpsrc, [
AC_SUBST(GST_HTTPSRC_GET_TYPE) AC_SUBST(GST_HTTPSRC_GET_TYPE)
]) ])
dnl *** ivorbis ***
dnl AM_PATH_IVORBIS only takes two options
translit(dnm, m, l) AM_CONDITIONAL(USE_IVORBIS, true)
GST_CHECK_FEATURE(IVORBIS, [integer vorbis plug-in], ivorbisdec, [
XIPH_PATH_IVORBIS(HAVE_IVORBIS=yes, HAVE_IVORBIS=no)
AS_SCRUB_INCLUDE(IVORBIS_CFLAGS)
])
dnl *** ivorbis ***
dnl AM_PATH_IVORBIS only takes two options
translit(dnm, m, l) AM_CONDITIONAL(USE_IVORBIS, true)
GST_CHECK_FEATURE(IVORBIS, [integer vorbis plug-in], ivorbisdec, [
XIPH_PATH_IVORBIS(HAVE_IVORBIS=yes, HAVE_IVORBIS=no)
AS_SCRUB_INCLUDE(IVORBIS_CFLAGS)
])
dnl *** Jack *** dnl *** Jack ***
translit(dnm, m, l) AM_CONDITIONAL(USE_JACK, true) translit(dnm, m, l) AM_CONDITIONAL(USE_JACK, true)
GST_CHECK_FEATURE(JACK, Jack, jack, [ GST_CHECK_FEATURE(JACK, Jack, jack, [
...@@ -1098,6 +1114,7 @@ ext/gnomevfs/Makefile ...@@ -1098,6 +1114,7 @@ ext/gnomevfs/Makefile
ext/gsm/Makefile ext/gsm/Makefile
ext/hermes/Makefile ext/hermes/Makefile
ext/http/Makefile ext/http/Makefile
ext/ivorbis/Makefile
ext/jack/Makefile ext/jack/Makefile
ext/jpeg/Makefile ext/jpeg/Makefile
ext/ladspa/Makefile ext/ladspa/Makefile
......
...@@ -238,6 +238,12 @@ else ...@@ -238,6 +238,12 @@ else
TARKIN_DIR= TARKIN_DIR=
endif endif
if USE_IVORBIS
IVORBIS_DIR=ivorbis
else
IVORBIS_DIR=
endif
if USE_VORBIS if USE_VORBIS
VORBIS_DIR=vorbis VORBIS_DIR=vorbis
else else
...@@ -268,7 +274,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ ...@@ -268,7 +274,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
$(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \ $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \
$(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
$(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \ $(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \
$(VORBIS_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR) $(IVORBIS_DIR) $(VORBIS_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR)
DIST_SUBDIRS=\ DIST_SUBDIRS=\
a52dec aalib alsa \ a52dec aalib alsa \
...@@ -276,7 +282,7 @@ DIST_SUBDIRS=\ ...@@ -276,7 +282,7 @@ DIST_SUBDIRS=\
audiofile cdparanoia dv \ audiofile cdparanoia dv \
dvdread dvdnav esd mas ffmpeg \ dvdread dvdnav esd mas ffmpeg \
flac gnomevfs gsm \ flac gnomevfs gsm \
hermes http jack jpeg \ hermes http ivorbis jack jpeg \
ladspa lame lcs libfame libpng \ ladspa lame lcs libfame libpng \
mad mikmod mjpegtools mpeg2dec \ mad mikmod mjpegtools mpeg2dec \
openquicktime raw1394 rtp \ openquicktime raw1394 rtp \
......
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