Complete the move of the RTP plugin

Original commit message from CVS:
Complete the move of the RTP plugin

diff --git a/configure.ac b/configure.ac
index 3c977c9..1ca6345 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -73,12 +73,10 @@ GST_CHECK_FEATURE(EXPERIMENTAL, [enable building of experimental plug-ins],,
 [
   AC_MSG_WARN(building experimental plug-ins)
   USE_TARKIN="yes"
-  USE_RTP="yes"
   USE_SHOUT2="yes"
 ],[
   AC_MSG_NOTICE(not building experimental plug-ins)
   USE_TARKIN="no"
-  USE_RTP="no"
   USE_SHOUT2="no"
 ])
 
@@ -762,22 +760,6 @@ GST_CHECK_FEATURE(RAW1394, [raw1394 library], dv1394src, [
   AC_SUBST(RAW1394_LIBS)
 ])
 
-dnl *** rtp ***
-dnl FIXME : adapt and make it work
-translit(dnm, m, l) AM_CONDITIONAL(USE_RTP, true)
-GST_CHECK_FEATURE(RTP, [RTP library], rtpenc rtpdec,[
-  AC_CHECK_LIB(ortp, ortp_init, HAVE_RTP=yes, HAVE_RTP=no, $GST_CFLAGS $GST_LIBS)
-  RTP_LIBS="-lortp"
-  AC_SUBST(RTP_LIBS)
-])
-
-dnl FIXME header check needs to use GLIB_CFLAGS in order to succeed for rtp
-dnl can use GST_* which should have GLIB_* info
-dnl AC_CHECK_HEADERS(rtp/rtp.h, HAVE_LIBRTP=yes, HAVE_LIBRTP=no)
-dnl AC_CHECK_HEADERS(rtp/rtp-packet.h, :, HAVE_LIBRTP=no)
-dnl AC_CHECK_HEADERS(rtp/rtcp-packet.h, :, HAVE_LIBRTP=no)
-dnl AC_CHECK_HEADERS(rtp/rtp-audio.h, :, HAVE_LIBRTP=no)
-
 dnl *** SDL ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_SDL, true)
 GST_CHECK_FEATURE(SDL, [SDL plug-in], sdlvideosink, [
@@ -1056,6 +1038,7 @@ gst/passthrough/Makefile
 gst/playondemand/Makefile
 gst/qtdemux/Makefile
 gst/rtjpeg/Makefile
+gst/rtp/Makefile
 gst/silence/Makefile
 gst/sine/Makefile
 gst/smooth/Makefile
@@ -1120,7 +1103,6 @@ ext/mjpegtools/Makefile
 ext/mpeg2dec/Makefile
 ext/openquicktime/Makefile
 ext/raw1394/Makefile
-ext/rtp/Makefile
 ext/sdl/Makefile
 ext/shout/Makefile
 ext/shout2/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 4514d88..752bfbc 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -196,12 +196,6 @@ else
 RAW1394_DIR=
 endif
 
-if USE_RTP
-RTP_DIR=rtp
-else
-RTP_DIR=
-endif
-
 if USE_SDL
 SDL_DIR=sdl
 else
@@ -271,7 +265,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
        $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) \
        $(LIBDV_DIR) $(LIBFAME_DIR) $(LIBPNG_DIR) \
        $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \
-       $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \
+       $(OPENQUICKTIME_DIR) $(RAW1394_DIR) \
        $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
        $(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \
        $(VORBIS_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR)
@@ -285,6 +279,6 @@ DIST_SUBDIRS=\
        hermes http ivorbis jack jpeg \
        ladspa lame lcs libfame libpng \
        mad mikmod mjpegtools mpeg2dec \
-       openquicktime raw1394 rtp \
+       openquicktime raw1394 \
        sdl snapshot shout shout2 sidplay \
        smoothwave swfdec tarkin vorbis xmms