"LIVE.COM Streaming Media" is now called "LIVE555 Streaming Media".

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16573 b3059339-0415-0410-9bf9-f77b7e298cf2

9 files changed, 31 insertions, 31 deletions

diff --git a/AUTHORS b/AUTHORS
index ca583597eb..b294f09d9e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -256,8 +256,8 @@ Ferguson, Tim <timf@mail.csse.monash.edu.au>
     * open source Cinepak decoder
     * open source CYUV decoder
 
-Finlayson, Ross <finlayson@live.com>
-    * LIVE.COM Streaming Media library author
+Finlayson, Ross <finlayson@live555.com>
+    * LIVE555 Streaming Media library author
     * RTP/RTSP streaming support
 
 Forghieri, Daniele (xdanny) <guru@digitalfantasy.it>
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index b7af65bb9d..7e67af6b44 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -81,7 +81,7 @@ extern void vo_zr_revertoption(m_option_t* opt,char* pram);
 extern m_option_t dxr2_opts[];
 #endif
 
-#ifdef STREAMING_LIVE_DOT_COM
+#ifdef STREAMING_LIVE555
 extern int isSDPFile;
 extern int rtspStreamOverTCP;
 #endif
@@ -287,12 +287,12 @@ m_option_t mplayer_opts[]={
 	{"dxr2", &dxr2_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
 
-#ifdef STREAMING_LIVE_DOT_COM
+#ifdef STREAMING_LIVE555
         {"sdp", "-sdp is obsolete, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	// -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP
         {"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 #else
-	{"rtsp-stream-over-tcp", "RTSP support requires the \"LIVE.COM Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"rtsp-stream-over-tcp", "RTSP support requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 
 //---------------------- mplayer-only options ------------------------
diff --git a/configure b/configure
index 11dc2fe48f..2596c439c0 100755
--- a/configure
+++ b/configure
@@ -189,7 +189,7 @@ Optional features:
   --disable-network      disable network support (for: http/mms/rtp) [enable]
   --enable-winsock2      enable winsock2 usage [autodetect]
   --enable-smb           enable Samba (SMB) input support [autodetect]
-  --enable-live          enable LIVE.COM Streaming Media support [autodetect]
+  --enable-live          enable LIVE555 Streaming Media support [autodetect]
   --disable-dvdread      Disable libdvdread support [autodetect]
   --disable-mpdvdkit     Disable mpdvdkit/mpdvdkit2 support [autodetect]
   --disable-cdparanoia   Disable cdparanoia support [autodetect]
@@ -366,7 +366,7 @@ multiple paths separated by ':'):
   --with-x264incdir=DIR    x264 header in DIR
   --with-dtslibdir=DIR     libdts library in DIR  (*)
   --with-dtsincdir=DIR     libdts header in DIR (*)
-  --with-livelibdir=DIR    LIVE.COM Streaming Media libraries in DIR
+  --with-livelibdir=DIR    LIVE555 Streaming Media libraries in DIR
   --with-toolamedir=DIR    path to Toolame library and include file
   --with-xmmsplugindir=DIR XMMS plugins in DIR
   --with-xmmslibdir=DIR    libxmms.so.1 in DIR
@@ -5768,14 +5768,14 @@ fi
 echores "$_real"
 
 
-echocheck "LIVE.COM Streaming Media libraries"
+echocheck "LIVE555 Streaming Media libraries"
 if test "$_live" = auto  && test "$_network" = yes ; then
   _TMPC=$TMPC
   TMPC=$TMPCPP
   cat >$TMPC <<EOF
 #include <liveMedia.hh>
 #if (LIVEMEDIA_LIBRARY_VERSION_INT < 1090195200)
-#error Please upgrade to version 2004.07.19 or later of the "LIVE.COM Streaming Media" libraries - available from <www.live.com/liveMedia/>
+#error Please upgrade to version 2004.07.19 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
 #endif
 int main(void) {}
 EOF
@@ -5804,8 +5804,8 @@ EOF
 fi
 if test "$_live" = yes && test "$_network" = yes ; then
   echores "yes (using $_livelibdir)"
-  _def_live='#define STREAMING_LIVE_DOT_COM 1'
-  _live_libs_def="# LIVE.COM Streaming Media libraries:
+  _def_live='#define STREAMING_LIVE555 1'
+  _live_libs_def="# LIVE555 Streaming Media libraries:
 LIVE_LIB_DIR = $_livelibdir
 LIVE_LIBS =  \$(LIVE_LIB_DIR)/liveMedia/libliveMedia.a
 LIVE_LIBS += \$(LIVE_LIB_DIR)/groupsock/libgroupsock.a
@@ -5817,12 +5817,12 @@ LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/UsageEnvironment/include
 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/BasicUsageEnvironment/include
 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/groupsock/include"
   _ld_live='$(LIVE_LIBS)'
- _inputmodules="live.com $_inputmodules"
+ _inputmodules="live555 $_inputmodules"
 elif test "$_live_dist" = yes && test "$_network" = yes ; then
   echores "yes (using distribution version)"
   _live="yes"
-  _def_live='#define STREAMING_LIVE_DOT_COM 1'
-  _live_libs_def="# LIVE.COM Streaming Media libraries:
+  _def_live='#define STREAMING_LIVE555 1'
+  _live_libs_def="# LIVE555 Streaming Media libraries:
 LIVE_LIB_DIR = $_livelibdir
 LIVE_LIBS =  -lliveMedia
 LIVE_LIBS += -lgroupsock
@@ -5834,11 +5834,11 @@ LIVE_INCLUDES += -I/usr/include/UsageEnvironment
 LIVE_INCLUDES += -I/usr/include/BasicUsageEnvironment                                                                     
 LIVE_INCLUDES += -I/usr/include/groupsock"
   _ld_live='$(LIVE_LIBS)'
- _inputmodules="live.com $_inputmodules"
+ _inputmodules="live555 $_inputmodules"
 else
   echores "no"
-  _def_live='#undef STREAMING_LIVE_DOT_COM'
-  _noinputmodules="live.com $_noinputmodules"
+  _def_live='#undef STREAMING_LIVE555'
+  _noinputmodules="live555 $_noinputmodules"
 fi
 
 echocheck "FFmpeg libavutil (static)"
@@ -6932,7 +6932,7 @@ PRG_MENCODER = $_prg_mencoder
 $_live_libs_def
 
 MPLAYER_NETWORK = $_network
-STREAMING_LIVE_DOT_COM = $_live
+STREAMING_LIVE555 = $_live
 MPLAYER_NETWORK_LIB = $_ld_live $_ld_vstream $_ld_network
 DVBIN = $_dvbin
 VIDIX = $_vidix
@@ -7446,7 +7446,7 @@ $_def_real
 /* Default search path */
 $_def_real_path
 
-/* LIVE.COM Streaming Media library support */
+/* LIVE555 Streaming Media library support */
 $_def_live
 
 /* Use 3dnow/mmxext/sse/mmx optimized fast memcpy() [maybe buggy... signal 4]*/
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 0c13fb69f9..01deaa3f72 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -135,7 +135,7 @@ SRCS += realrtsp/asmrp.c \
         realrtsp/sdpplin.c \
         realrtsp/xbuffer.c \
 
-ifeq ($(STREAMING_LIVE_DOT_COM),yes)
+ifeq ($(STREAMING_LIVE555),yes)
 CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp
 CPLUSPLUSINCLUDE = $(LIVE_INCLUDES)
 endif
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index 7c1cf96243..5dfe7585c7 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -1,5 +1,5 @@
 ////////// Routines (with C-linkage) that interface between "MPlayer"
-////////// and the "LIVE.COM Streaming Media" libraries:
+////////// and the "LIVE555 Streaming Media" libraries:
 
 extern "C" {
 // on MinGW, we must include windows.h before the things it conflicts
@@ -580,11 +580,11 @@ demux_packet_t* ReadBufferQueue::getPendingBuffer() {
 
 
 demuxer_desc_t demuxer_desc_rtp = {
-  "live.com RTP demuxer",
+  "LIVE555 RTP demuxer",
   "rtp",
   "",
   "Ross Finlayson",
-  "requires live.com library",
+  "requires LIVE555 Streaming Media library",
   DEMUXER_TYPE_RTP,
   0, // no autodetect
   NULL,
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp
index d4b5dcbf7d..76ce3f6a42 100644
--- a/libmpdemux/demux_rtp_codec.cpp
+++ b/libmpdemux/demux_rtp_codec.cpp
@@ -1,5 +1,5 @@
 ////////// Codec-specific routines used to interface between "MPlayer"
-////////// and the "LIVE.COM Streaming Media" libraries:
+////////// and the "LIVE555 Streaming Media" libraries:
 
 #include "demux_rtp_internal.h"
 extern "C" {
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index a13e7d8878..dcf82abd1c 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -114,7 +114,7 @@ demuxer_desc_t* demuxer_list[] = {
   &demuxer_desc_xmms,
 #endif
   &demuxer_desc_mpeg_ty,
-#ifdef STREAMING_LIVE_DOT_COM
+#ifdef STREAMING_LIVE555
   &demuxer_desc_rtp,
 #endif
 #ifdef USE_LIBAVFORMAT
diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c
index 7c665d51f8..74bbe65992 100644
--- a/libmpdemux/stream.c
+++ b/libmpdemux/stream.c
@@ -67,7 +67,7 @@ extern stream_info_t stream_info_dvdnav;
 #ifdef LIBSMBCLIENT
 extern stream_info_t stream_info_smb;
 #endif
-#ifdef STREAMING_LIVE_DOT_COM
+#ifdef STREAMING_LIVE555
 extern stream_info_t stream_info_sdp;
 extern stream_info_t stream_info_rtsp_sip;
 #endif;
@@ -90,7 +90,7 @@ stream_info_t* auto_open_streams[] = {
   &stream_info_asf,
   &stream_info_pnm,
   &stream_info_rtsp,
-#ifdef STREAMING_LIVE_DOT_COM
+#ifdef STREAMING_LIVE555
   &stream_info_sdp,
   &stream_info_rtsp_sip,
 #endif
diff --git a/libmpdemux/stream_livedotcom.c b/libmpdemux/stream_livedotcom.c
index d70b397fdd..19936b9cb4 100644
--- a/libmpdemux/stream_livedotcom.c
+++ b/libmpdemux/stream_livedotcom.c
@@ -12,7 +12,7 @@
 #include "demuxer.h"
 #include "help_mp.h"
 
-#ifdef STREAMING_LIVE_DOT_COM
+#ifdef STREAMING_LIVE555
 
 extern int network_bandwidth;
 
@@ -38,7 +38,7 @@ static int open_live_rtsp_sip(stream_t *stream,int mode, void* opts, int* file_f
   stream->streaming_ctrl->url = check4proxies(url);
   //url_free(url);
 
-  mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_LIVEDOTCOM, URL: %s\n", stream->url);
+  mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_LIVE555, URL: %s\n", stream->url);
 
   if(rtsp_streaming_start(stream) < 0) {
     mp_msg(MSGT_NETWORK,MSGL_ERR,"rtsp_streaming_start failed\n");
@@ -100,7 +100,7 @@ stream_info_t stream_info_rtsp_sip = {
   "standard RTSP and SIP",
   "RTSP and SIP",
   "Ross Finlayson",
-  "Uses LIVE.COM streaming library.",
+  "Uses LIVE555 Streaming Media library.",
   open_live_rtsp_sip,
   {"rtsp", "sip", NULL },
   NULL,
@@ -111,7 +111,7 @@ stream_info_t stream_info_sdp = {
   "SDP stream descriptor",
   "SDP",
   "Ross Finlayson",
-  "Uses live.com streaming library.",
+  "Uses LIVE555 Streaming Media library.",
   open_live_sdp,
   {"sdp", NULL },
   NULL,