merge integer based Tremor vorbis plugin

Original commit message from CVS:
merge integer based Tremor vorbis plugin

diff --git a/configure.ac b/configure.ac
index 4ae65d8..6e8231c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -601,6 +601,22 @@ GST_CHECK_FEATURE(HTTP, [http plug-ins], gsthttpsrc, [
   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 ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_JACK, true)
 GST_CHECK_FEATURE(JACK, Jack, jack, [
@@ -1098,6 +1114,7 @@ ext/gnomevfs/Makefile
 ext/gsm/Makefile
 ext/hermes/Makefile
 ext/http/Makefile
+ext/ivorbis/Makefile
 ext/jack/Makefile
 ext/jpeg/Makefile
 ext/ladspa/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 0d107fc..6816c7d 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -238,6 +238,12 @@ else
 TARKIN_DIR=
 endif
 
+if USE_IVORBIS
+IVORBIS_DIR=ivorbis
+else
+IVORBIS_DIR=
+endif
+
 if USE_VORBIS
 VORBIS_DIR=vorbis
 else
@@ -268,7 +274,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
        $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \
        $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
        $(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \
-       $(VORBIS_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR)
+       $(IVORBIS_DIR) $(VORBIS_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR)
 
 DIST_SUBDIRS=\
        a52dec aalib alsa \
@@ -276,7 +282,7 @@ DIST_SUBDIRS=\
        audiofile cdparanoia dv \
        dvdread dvdnav esd mas ffmpeg \
        flac gnomevfs gsm \
-       hermes http jack jpeg \
+       hermes http ivorbis jack jpeg \
        ladspa lame lcs libfame libpng \
        mad mikmod mjpegtools mpeg2dec \
        openquicktime raw1394 rtp \