diff --git a/DOCS/it/documentation.html b/DOCS/it/documentation.html index 417cd9e6bc..278a1fe7cc 100644 --- a/DOCS/it/documentation.html +++ b/DOCS/it/documentation.html @@ -506,7 +506,7 @@ del tempo, ma ne vale sicuramente la pena.

la versione suggerita è sempre la più recente (almeno 3.90).
  • libogg - opzionale, necessario per leggere il formato file OGG.
  • libvorbis - opzionale, necessario per leggere i file audio OGG Vorbis.
    • -
  • LIVE.COM Streaming Media +
  • LIVE.COM Streaming Media - opzionale, necessario per vedere gli stream RTSP/RTP.
  • directfb - opzionale, da http://www.directfb.org
    • diff --git a/DOCS/it/formats.html b/DOCS/it/formats.html index 4ee819c9e4..a6fd679727 100644 --- a/DOCS/it/formats.html +++ b/DOCS/it/formats.html @@ -211,7 +211,7 @@ Questi file sono in realt

    SDP è un formato standard della IETF per descrivere flussi RTP video e/o audio. - (Sono necessarie le librerie "LIVE.COM Streaming Media".)

    + (Sono necessarie le librerie "LIVE.COM Streaming Media".)

    2.1.1.14 File PVA

    diff --git a/DOCS/man/es/mplayer.1 b/DOCS/man/es/mplayer.1 index 7242822cc0..a8fef278b7 100644 --- a/DOCS/man/es/mplayer.1 +++ b/DOCS/man/es/mplayer.1 @@ -1078,11 +1078,11 @@ tama .PD 1 . .TP -.B \-rtsp-stream-over-tcp (live.com solamente) +.B \-rtsp-stream-over-tcp (LIVE555 solamente) Usado con URLs 'rtsp://' para especificar que los paquetes entrantes RTP y RTCP serán enviados a través de TCP (usando la misma conección TCP como RTSP). Esta opción puede ser útil si dispone de una mala conección a internet que -no acepta paquetes UDP entrantes (vea http://www.live.com/\:mplayer/). +no acepta paquetes UDP entrantes (vea http://www.live555.com/\:mplayer/). . .TP .B \-saveidx diff --git a/DOCS/man/pl/mplayer.1 b/DOCS/man/pl/mplayer.1 index b561f00f4d..a125e4217e 100644 --- a/DOCS/man/pl/mplayer.1 +++ b/DOCS/man/pl/mplayer.1 @@ -1188,7 +1188,7 @@ rozmiar ramki w bajtach U¿ywane z URLami "rtsp://" dla okre¶lenia, ¿e nadchodz±ce pakiety RTP i RTCP maj± byæ przesy³ane przez TCP (u¿ywaj±c tego samego po³±czenia co RTSP). Przydatne przy uszkodzonym po³±czeniu internetowym, które nie przepuszcza -pakietów UDP (zobacz tak¿e http://www.live.com/\:mplayer). +pakietów UDP (zobacz tak¿e http://www.live555.com/\:mplayer). . .TP .B \-saveidx diff --git a/DOCS/man/sv/mplayer.1 b/DOCS/man/sv/mplayer.1 index 0025edc033..a9cde50fa4 100644 --- a/DOCS/man/sv/mplayer.1 +++ b/DOCS/man/sv/mplayer.1 @@ -1061,11 +1061,11 @@ frame size in Bytes .PD 1 . .TP -.B \-rtsp-stream-over-tcp (live.com only) +.B \-rtsp-stream-over-tcp (LIVE555 only) Used with 'rtsp://' URLs to specify that the resulting incoming RTP and RTCP packets be streamed over TCP (using the same TCP connection as RTSP). This option may be useful if you have a broken internet connection that does -not pass incoming UDP packets (see http://www.live.com/\:mplayer/). +not pass incoming UDP packets (see http://www.live555.com/\:mplayer/). . .TP .B \-saveidx diff --git a/DOCS/man/zh/mplayer.1 b/DOCS/man/zh/mplayer.1 index 22e2ea61e8..58de020f6c 100644 --- a/DOCS/man/zh/mplayer.1 +++ b/DOCS/man/zh/mplayer.1 @@ -278,7 +278,7 @@ gl2, and svga. .TP .B \-sdp Ö¸¶¨ÊäÈëÎļþΪÃèÊöÒ»¸öRTP»á»°µÄSDP('Session Description Protocol')Îļþ, -(²Î¼ûhttp://www.live.com/mplayer/). +(²Î¼ûhttp://www.live555.com/mplayer/). .TP .B \-shuffle ÒÔËæ»ú˳Ðò²¥·ÅÎļþ. @@ -578,7 +578,7 @@ Full 5.1 Óë'rtsp://'URLÒ»ÆðÓÃÀ´Ö¸¶¨×îºó½á¹ûÊäÈëµÄRTPºÍRTCPµÄ°üͨ¹ýTCPÁ÷, (¸úRTSPʹÓÃͬһ¸öTCPÁ¬½Ó ). Õâ¸öÑ¡Ïî¿ÉÒÔÓÃÓÚµ±ÄãµÄInternetÁ¬½Ó²»ÔÊÐíUDP°ü½øÈëµÄÇé¿ö. -(²Î¼ûhttp://www.live.com/mplayer/). +(²Î¼ûhttp://www.live555.com/mplayer/). .TP .B \-skipopening Ìá¹ýDVD´ò¿ª(½öÓÃÓÚdvdnav). diff --git a/DOCS/tech/formats.txt b/DOCS/tech/formats.txt index 3acbe84215..63b49dd37b 100644 --- a/DOCS/tech/formats.txt +++ b/DOCS/tech/formats.txt @@ -7,7 +7,7 @@ - DVD titles using menu navigation (experimental/alpha, not yet finished!!!) - CDDA - raw audio from audio CD-ROM discs (using cdparanoia libs) - RTP streaming (mpeg-ps over multicast only) - - Live.com streaming - support SDP/RTSP (using the live.com libs) + - LIVE555 streaming - support SDP/RTSP (using the LIVE555 libs) - SMB - file access over samba (experimental) 2. Demuxer/parser layer, supported file/media formats: diff --git a/DOCS/xml/es/formats.xml b/DOCS/xml/es/formats.xml index 70e085d85b..510d1c5f16 100644 --- a/DOCS/xml/es/formats.xml +++ b/DOCS/xml/es/formats.xml @@ -340,7 +340,7 @@ de compilar MPlayer para poder reproducirlos. SDP es un formato estándar IETF para describir flujos de video y/o audio RTP. -(Se requiere "LIVE.COM Streaming Media".) +(Se requiere "LIVE.COM Streaming Media".) diff --git a/DOCS/xml/es/install.xml b/DOCS/xml/es/install.xml index 27ebc2ee15..01ace463c5 100644 --- a/DOCS/xml/es/install.xml +++ b/DOCS/xml/es/install.xml @@ -93,7 +93,7 @@ n libvorbis - opcional, necesario para reproducir archivos de audio OGG Vorbis. - LIVE.COM Streaming Media + LIVE.COM Streaming Media - opcional, necesario para reproducir flujos RTSP/RTP. diff --git a/DOCS/xml/ru/formats.xml b/DOCS/xml/ru/formats.xml index fc81654b38..deded93ca7 100644 --- a/DOCS/xml/ru/formats.xml +++ b/DOCS/xml/ru/formats.xml @@ -322,7 +322,7 @@ RoQ SDP - ÜÔÏ IETF ÓÔÁÎÄÁÒÔÎÙÊ ÆÏÒÍÁÔ ÄÌÑ ÏÐÉÓÁÎÉÑ ×ÉÄÅÏ É ÁÕÄÉÏ RTP ÐÏÔÏËÏ×. -(ÔÒÅÂÕÅÔÓÑ "LIVE.COM Streaming Media".) +(ÔÒÅÂÕÅÔÓÑ "LIVE.COM Streaming Media".) diff --git a/DOCS/xml/ru/install.xml b/DOCS/xml/ru/install.xml index 1bf4c14515..87f2799b60 100644 --- a/DOCS/xml/ru/install.xml +++ b/DOCS/xml/ru/install.xml @@ -96,7 +96,7 @@ libstdc++, libvorbis - ÎÅÏÂÑÚÁÔÅÌØÎÏ, ÎÅÏÂÈÏÄÉÍÏ ÄÌÑ ÐÒÏÉÇÒÙ×ÁÎÉÑ OGG Vorbis ÁÕÄÉÏ. - LIVE.COM Streaming Media + LIVE.COM Streaming Media - ÎÅÏÂÑÚÁÔÅÌØÎÏ, ÎÅÏÂÈÏÄÉÍÏ ÄÌÑ ÐÒÏÉÇÒÙ×ÁÎÉÑ RTSP/RTP ÐÏÔÏËÏ×. diff --git a/DOCS/zh/documentation.html b/DOCS/zh/documentation.html index 4a9c324d7c..10f42da0ef 100644 --- a/DOCS/zh/documentation.html +++ b/DOCS/zh/documentation.html @@ -480,7 +480,7 @@ HREF="users_against_developers.html">
  • lame -- ÍƼö£¬MEncoderÐèÒªÓÃËü°ÑÒôƵ×öMP3±àÂ룬½¨Òé×ÜʹÓÃ×îа汾(3.90»òÒÔÉÏ)¡£
  • libogg -- ¿ÉÑ¡£¬ÓÃÓÚ²¥·ÅOGGÎļþ¸ñʽ¡£
  • libvorbis -- ¿ÉÑ¡£¬ÓÃÓÚ²¥·ÅOGG VorbisÒôƵ¡£
    • -
  • LIVE.COM Streaming Media +
  • LIVE.COM Streaming Media -- ¿ÉÑ¡£¬ÓÃÓÚ²¥·ÅRTSP/RTPÁ÷¡£
  • directfb -- ¿ÉÑ¡£¬´Óhttp://www.directfb.org»ñµÃ
  • cdparanoia -- ¿ÉÑ¡£¬ÓÃÓÚCDDAÖ§³Ö
    • diff --git a/DOCS/zh/formats.html b/DOCS/zh/formats.html index 2e2e8e060c..ec3fda1d4a 100644 --- a/DOCS/zh/formats.html +++ b/DOCS/zh/formats.html @@ -156,7 +156,7 @@ CBR

    2.1.1.13 SDPÎļþ

    SDPÊÇÒ»¸öIETF±ê×¼¸ñʽ£¬ÓÃÀ´ÃèÊöÊÓƵºÍ/»òÕßÒôƵµÄRTPÁ÷¡£ -(ÐèÒª"LIVE.COM Streaming Media"¿â)¡£

    +(ÐèÒª"LIVE.COM Streaming Media"¿â)¡£

    2.1.1.14 PVAÎļþ

    diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile index 81d37f08cf..5214212a7b 100644 --- a/TOOLS/netstream/Makefile +++ b/TOOLS/netstream/Makefile @@ -17,7 +17,7 @@ all: netstream # FIXME: linking is a mess that should be fixed properly some day -# it does not work with either GUI, live.com or libavformat enabled +# it does not work with either GUI, LIVE555 or libavformat enabled DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \ $(MPROOT)/stream/stream.a \ $(MPROOT)/libmpdvdkit2/libmpdvdkit.a \