diff options
author | 2005-09-23 22:35:04 +0000 | |
---|---|---|
committer | 2005-09-23 22:35:04 +0000 | |
commit | b383ffa4b7ececfa96e12d4ecb2e18f9d924bcbb (patch) | |
tree | 32231c5ce39fd686fd3e4f3a66cc8acb5f7473b5 /libmpdemux | |
parent | c7a4d689a60755ac3ea05cd70eb0f9462125fdb4 (diff) |
"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
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/Makefile | 2 | ||||
-rw-r--r-- | libmpdemux/demux_rtp.cpp | 6 | ||||
-rw-r--r-- | libmpdemux/demux_rtp_codec.cpp | 2 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 2 | ||||
-rw-r--r-- | libmpdemux/stream.c | 4 | ||||
-rw-r--r-- | libmpdemux/stream_livedotcom.c | 8 |
6 files changed, 12 insertions, 12 deletions
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, |