# HG changeset patch # User rsf # Date 1127514904 0 # Node ID 56a5f69e9b351d4df7b071bdefe2542a00b90d9b # Parent 865ef897f78632c25e27b9a7ee0b6078f9699473 "LIVE.COM Streaming Media" is now called "LIVE555 Streaming Media". diff -r 865ef897f786 -r 56a5f69e9b35 AUTHORS --- a/AUTHORS Fri Sep 23 20:11:39 2005 +0000 +++ b/AUTHORS Fri Sep 23 22:35:04 2005 +0000 @@ -256,8 +256,8 @@ * open source Cinepak decoder * open source CYUV decoder -Finlayson, Ross - * LIVE.COM Streaming Media library author +Finlayson, Ross + * LIVE555 Streaming Media library author * RTP/RTSP streaming support Forghieri, Daniele (xdanny) diff -r 865ef897f786 -r 56a5f69e9b35 cfg-mplayer.h --- a/cfg-mplayer.h Fri Sep 23 20:11:39 2005 +0000 +++ b/cfg-mplayer.h Fri Sep 23 22:35:04 2005 +0000 @@ -81,7 +81,7 @@ 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 @@ {"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 -r 865ef897f786 -r 56a5f69e9b35 configure --- a/configure Fri Sep 23 20:11:39 2005 +0000 +++ b/configure Fri Sep 23 22:35:04 2005 +0000 @@ -189,7 +189,7 @@ --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 @@ --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 @@ 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 < #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 +#error Please upgrade to version 2004.07.19 or later of the "LIVE555 Streaming Media" libraries - available from #endif int main(void) {} EOF @@ -5804,8 +5804,8 @@ 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)/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/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 @@ $_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 @@ /* 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 -r 865ef897f786 -r 56a5f69e9b35 libmpdemux/Makefile --- a/libmpdemux/Makefile Fri Sep 23 20:11:39 2005 +0000 +++ b/libmpdemux/Makefile Fri Sep 23 22:35:04 2005 +0000 @@ -135,7 +135,7 @@ 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 -r 865ef897f786 -r 56a5f69e9b35 libmpdemux/demux_rtp.cpp --- a/libmpdemux/demux_rtp.cpp Fri Sep 23 20:11:39 2005 +0000 +++ b/libmpdemux/demux_rtp.cpp Fri Sep 23 22:35:04 2005 +0000 @@ -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 @@ 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 -r 865ef897f786 -r 56a5f69e9b35 libmpdemux/demux_rtp_codec.cpp --- a/libmpdemux/demux_rtp_codec.cpp Fri Sep 23 20:11:39 2005 +0000 +++ b/libmpdemux/demux_rtp_codec.cpp Fri Sep 23 22:35:04 2005 +0000 @@ -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 -r 865ef897f786 -r 56a5f69e9b35 libmpdemux/demuxer.c --- a/libmpdemux/demuxer.c Fri Sep 23 20:11:39 2005 +0000 +++ b/libmpdemux/demuxer.c Fri Sep 23 22:35:04 2005 +0000 @@ -114,7 +114,7 @@ &demuxer_desc_xmms, #endif &demuxer_desc_mpeg_ty, -#ifdef STREAMING_LIVE_DOT_COM +#ifdef STREAMING_LIVE555 &demuxer_desc_rtp, #endif #ifdef USE_LIBAVFORMAT diff -r 865ef897f786 -r 56a5f69e9b35 libmpdemux/stream.c --- a/libmpdemux/stream.c Fri Sep 23 20:11:39 2005 +0000 +++ b/libmpdemux/stream.c Fri Sep 23 22:35:04 2005 +0000 @@ -67,7 +67,7 @@ #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_asf, &stream_info_pnm, &stream_info_rtsp, -#ifdef STREAMING_LIVE_DOT_COM +#ifdef STREAMING_LIVE555 &stream_info_sdp, &stream_info_rtsp_sip, #endif diff -r 865ef897f786 -r 56a5f69e9b35 libmpdemux/stream_livedotcom.c --- a/libmpdemux/stream_livedotcom.c Fri Sep 23 20:11:39 2005 +0000 +++ b/libmpdemux/stream_livedotcom.c Fri Sep 23 22:35:04 2005 +0000 @@ -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 @@ 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 @@ "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 @@ "SDP stream descriptor", "SDP", "Ross Finlayson", - "Uses live.com streaming library.", + "Uses LIVE555 Streaming Media library.", open_live_sdp, {"sdp", NULL }, NULL,