[vlc-commits] live555: move to access/ alongside all other acces_demux plugins

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jan 24 17:46:39 2013 +0200| [5d1a07d52d5913b0c993aedb6a95a2a47be151a7] | committer: Rémi Denis-Courmont

live555: move to access/ alongside all other acces_demux plugins

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d1a07d52d5913b0c993aedb6a95a2a47be151a7
---

 modules/access/Modules.am             |    1 +
 modules/{demux => access}/live555.cpp |    0
 modules/demux/Modules.am              |    1 -
 po/POTFILES.in                        |    2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 830e0b3..64f5dbf 100644
--- 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 01a9d72..4a0817c 100644
--- 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 7eb17ea..571e5d1 100644
--- 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