# HG changeset patch # User diego # Date 1156755347 0 # Node ID 42928a2e88fc1c7d746ea015c44cf3e4a82fe407 # Parent 607b12d19eed7e3425c8c67fc584e0319c11765f live.com --> LIVE555 diff -r 607b12d19eed -r 42928a2e88fc DOCS/it/documentation.html --- a/DOCS/it/documentation.html Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/it/documentation.html Mon Aug 28 08:55:47 2006 +0000 @@ -506,7 +506,7 @@ 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 -r 607b12d19eed -r 42928a2e88fc DOCS/it/formats.html --- a/DOCS/it/formats.html Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/it/formats.html Mon Aug 28 08:55:47 2006 +0000 @@ -211,7 +211,7 @@

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 -r 607b12d19eed -r 42928a2e88fc DOCS/man/es/mplayer.1 --- a/DOCS/man/es/mplayer.1 Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/man/es/mplayer.1 Mon Aug 28 08:55:47 2006 +0000 @@ -1078,11 +1078,11 @@ .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 -r 607b12d19eed -r 42928a2e88fc DOCS/man/pl/mplayer.1 --- a/DOCS/man/pl/mplayer.1 Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/man/pl/mplayer.1 Mon Aug 28 08:55:47 2006 +0000 @@ -1188,7 +1188,7 @@ 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 -r 607b12d19eed -r 42928a2e88fc DOCS/man/sv/mplayer.1 --- a/DOCS/man/sv/mplayer.1 Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/man/sv/mplayer.1 Mon Aug 28 08:55:47 2006 +0000 @@ -1061,11 +1061,11 @@ .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 -r 607b12d19eed -r 42928a2e88fc DOCS/man/zh/mplayer.1 --- a/DOCS/man/zh/mplayer.1 Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/man/zh/mplayer.1 Mon Aug 28 08:55:47 2006 +0000 @@ -278,7 +278,7 @@ .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 @@ Óë'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 -r 607b12d19eed -r 42928a2e88fc DOCS/tech/formats.txt --- a/DOCS/tech/formats.txt Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/tech/formats.txt Mon Aug 28 08:55:47 2006 +0000 @@ -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 -r 607b12d19eed -r 42928a2e88fc DOCS/xml/es/formats.xml --- a/DOCS/xml/es/formats.xml Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/xml/es/formats.xml Mon Aug 28 08:55:47 2006 +0000 @@ -340,7 +340,7 @@ 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 -r 607b12d19eed -r 42928a2e88fc DOCS/xml/es/install.xml --- a/DOCS/xml/es/install.xml Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/xml/es/install.xml Mon Aug 28 08:55:47 2006 +0000 @@ -93,7 +93,7 @@ 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 -r 607b12d19eed -r 42928a2e88fc DOCS/xml/ru/formats.xml --- a/DOCS/xml/ru/formats.xml Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/xml/ru/formats.xml Mon Aug 28 08:55:47 2006 +0000 @@ -322,7 +322,7 @@ SDP - ÜÔÏ IETF ÓÔÁÎÄÁÒÔÎÙÊ ÆÏÒÍÁÔ ÄÌÑ ÏÐÉÓÁÎÉÑ ×ÉÄÅÏ É ÁÕÄÉÏ RTP ÐÏÔÏËÏ×. -(ÔÒÅÂÕÅÔÓÑ "LIVE.COM Streaming Media".) +(ÔÒÅÂÕÅÔÓÑ "LIVE.COM Streaming Media".) diff -r 607b12d19eed -r 42928a2e88fc DOCS/xml/ru/install.xml --- a/DOCS/xml/ru/install.xml Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/xml/ru/install.xml Mon Aug 28 08:55:47 2006 +0000 @@ -96,7 +96,7 @@ libvorbis - ÎÅÏÂÑÚÁÔÅÌØÎÏ, ÎÅÏÂÈÏÄÉÍÏ ÄÌÑ ÐÒÏÉÇÒÙ×ÁÎÉÑ OGG Vorbis ÁÕÄÉÏ. - LIVE.COM Streaming Media + LIVE.COM Streaming Media - ÎÅÏÂÑÚÁÔÅÌØÎÏ, ÎÅÏÂÈÏÄÉÍÏ ÄÌÑ ÐÒÏÉÇÒÙ×ÁÎÉÑ RTSP/RTP ÐÏÔÏËÏ×. diff -r 607b12d19eed -r 42928a2e88fc DOCS/zh/documentation.html --- a/DOCS/zh/documentation.html Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/zh/documentation.html Mon Aug 28 08:55:47 2006 +0000 @@ -480,7 +480,7 @@

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 -r 607b12d19eed -r 42928a2e88fc DOCS/zh/formats.html --- a/DOCS/zh/formats.html Sun Aug 27 22:35:07 2006 +0000 +++ b/DOCS/zh/formats.html Mon Aug 28 08:55:47 2006 +0000 @@ -156,7 +156,7 @@

2.1.1.13 SDPÎÄ¼þ

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

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

2.1.1.14 PVAÎÄ¼þ

diff -r 607b12d19eed -r 42928a2e88fc TOOLS/netstream/Makefile --- a/TOOLS/netstream/Makefile Sun Aug 27 22:35:07 2006 +0000 +++ b/TOOLS/netstream/Makefile Mon Aug 28 08:55:47 2006 +0000 @@ -17,7 +17,7 @@ # 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 \