live555: move to access/ alongside all other acces_demux plugins

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 830e0b3fdb1a48377c1478730679755b3898f6a8..64f5dbfb552dd6c17edb47e555e8529d181d36ad 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -280,6 +280,7 @@ SOURCES_access_http = http.c
 SOURCES_htcpcp = htcpcp.c
 SOURCES_access_ftp = ftp.c
 SOURCES_access_sftp = sftp.c
+SOURCES_live555 = live555.cpp mms/asf.c mms/buffer.c
 
 libaccess_mms_plugin_la_SOURCES = \
        mms/mms.c mms/mms.h \

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

diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 01a9d72e29460726188942dd885819aa1bdad494..4a0817c3960ffad354091dfb8a98a0732d42dcb7 100644 (file)
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -7,7 +7,6 @@ SOURCES_rawvid = rawvid.c
 SOURCES_au = au.c
 SOURCES_rawaud = rawaud.c
 SOURCES_wav = wav.c
-SOURCES_live555 = live555.cpp ../access/mms/asf.c ../access/mms/buffer.c
 SOURCES_nsv = nsv.c
 SOURCES_real = real.c
 SOURCES_ps = ps.c ps.h

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7eb17ea3d28ee7925397d6457b298a056eb83e74..571e5d15d330f585545f469d42dd7cef8b715792 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -211,6 +211,7 @@ modules/access/imem.c
 modules/access/jack.c
 modules/access/linsys/linsys_hdsdi.c
 modules/access/linsys/linsys_sdi.c
+modules/access/live555.cpp
 modules/access/mms/asf.c
 modules/access/mms/asf.h
 modules/access/mms/buffer.c
@@ -448,7 +449,6 @@ modules/demux/flac.c
 modules/demux/gme.c
 modules/demux/image.c
 modules/demux/kate_categories.c
-modules/demux/live555.cpp
 modules/demux/mjpeg.c
 modules/demux/mkv/chapter_command.cpp
 modules/demux/mkv/chapter_command.hpp