Move RTP to access/rtp

diff --git a/configure.ac b/configure.ac
index 74459252f06aeeee3c70b24b8c33d1662eedb47c..36ad4144ce0264869ed413d106fc8f8f07f38a20 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5759,6 +5759,7 @@ AC_CONFIG_FILES([
   modules/access/dvb/Makefile
   modules/access/mms/Makefile
   modules/access/cdda/Makefile
+  modules/access/rtp/Makefile
   modules/access/rtsp/Makefile
   modules/access/rtmp/Makefile
   modules/access/v4l2/Makefile

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index c91bfd0bcf63872bbf4f9649454112aa38d81efb..c52e49954038958b1c2b689aea502bbd6d438413 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -3,7 +3,7 @@
 # obviously does not. Here is a fix for that.
 LIBTOOL=@LIBTOOL@ --tag=CC
 
-BASE_SUBDIRS = dvb mms cdda rtsp rtmp v4l2 vcd vcdx screen
+BASE_SUBDIRS = dvb mms cdda rtp rtsp rtmp v4l2 vcd vcdx screen
 EXTRA_SUBDIRS = bda dshow
 SUBDIRS = $(BASE_SUBDIRS)
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)

diff --git a/modules/access/rtp/Modules.am b/modules/access/rtp/Modules.am
new file mode 100644 (file)
index 0000000..e8150b7
--- /dev/null
+++ b/modules/access/rtp/Modules.am
@@ -0,0 +1,12 @@
+if HAVE_LIBGCRYPT
+# RTP plugin
+libvlc_LTLIBRARIES += \
+       librtp_plugin.la
+librtp_plugin_la_SOURCES = \
+       rtp.c rtp.h session.c
+librtp_plugin_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/libs/srtp
+librtp_plugin_la_LIBADD = $(AM_LIBADD) \
+       $(top_builddir)/libs/srtp/libvlc_srtp.la
+librtp_plugin_la_DEPENDENCIES = \
+       $(top_builddir)/libs/srtp/libvlc_srtp.la
+endif

diff --git a/modules/demux/rtp.c b/modules/access/rtp/rtp.c
similarity index 100%
rename from modules/demux/rtp.c
rename to modules/access/rtp/rtp.c

diff --git a/modules/demux/rtp.h b/modules/access/rtp/rtp.h
similarity index 100%
rename from modules/demux/rtp.h
rename to modules/access/rtp/rtp.h

diff --git a/modules/demux/rtpsession.c b/modules/access/rtp/session.c
similarity index 100%
rename from modules/demux/rtpsession.c
rename to modules/access/rtp/session.c

diff --git a/modules/demux/rtpxiph.c b/modules/access/rtp/xiph.c
similarity index 100%
rename from modules/demux/rtpxiph.c
rename to modules/access/rtp/xiph.c

diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 72f51fb56fe0384917345014d6324c147cb81984..6a81ab1d855724bac9e58f80bf81b795914d8ce9 100644 (file)
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -56,16 +56,3 @@ libvlc_LTLIBRARIES += \
        libwav_plugin.la \
        libxa_plugin.la \
        $(NULL)
-
-if HAVE_LIBGCRYPT
-# RTP plugin
-libvlc_LTLIBRARIES += \
-       librtp_plugin.la
-librtp_plugin_la_SOURCES = \
-       rtp.c rtp.h rtpsession.c
-librtp_plugin_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/libs/srtp
-librtp_plugin_la_LIBADD = $(AM_LIBADD) \
-       $(top_builddir)/libs/srtp/libvlc_srtp.la
-librtp_plugin_la_DEPENDENCIES = \
-       $(top_builddir)/libs/srtp/libvlc_srtp.la
-endif