diff options
-rw-r--r-- | DOCS/documentation.html | 13 | ||||
-rw-r--r-- | DOCS/formats.html | 8 | ||||
-rw-r--r-- | DOCS/mplayer.1 | 13 |
3 files changed, 30 insertions, 4 deletions
diff --git a/DOCS/documentation.html b/DOCS/documentation.html index e7a25c3b2c..2fd6db9e48 100644 --- a/DOCS/documentation.html +++ b/DOCS/documentation.html @@ -61,6 +61,7 @@ <LI><A HREF="formats.html#film">2.1.1.10 FILM files</A></LI> <LI><A HREF="formats.html#roq">2.1.1.11 RoQ files</A></LI> <LI><A HREF="formats.html#ogg">2.1.1.12 OGG/OGM files</A></LI> + <LI><A HREF="formats.html#sdp">2.1.1.12 SDP files</A></LI> </UL> </LI> <LI><A HREF="formats.html#audio_formats">2.1.2 Audio formats</A> @@ -435,6 +436,8 @@ suggested version is <B>always the newest</B> (at least 3.90).</LI> <LI><B>libogg</B> - optional, needed for playing OGG file format.</LI> <LI><B>libvorbis</B> - optional, needed for playing OGG Vorbis audio.</LI> + <LI><B><A HREF="http://www.live.com/mplayer/">LIVE.COM Streaming Media</A></B> + - optional, needed for playing RTSP/RTP streams.</LI> </UL> <H4>Codecs:</H4> @@ -995,12 +998,13 @@ controls.</P> <TR><TD></TD><TD>files</TD><TD></TD><TD><CODE>mplayer [default options] [path/]filename1 [options for filename1] filename2 [options for filename2] ...</CODE></TD></TR> <TR><TD></TD><TD>VCD</TD><TD></TD><TD><CODE>mplayer [options] -vcd trackno [-cdrom-device /dev/cdrom]</CODE></TD></TR> <TR><TD></TD><TD>DVD</TD><TD></TD><TD><CODE>mplayer [options] -dvd titleno [-dvd-device /dev/dvd]</CODE></TD></TR> - <TR><TD></TD><TD>net</TD><TD></TD><TD><CODE>mplayer [options] http://site.com/file.asf (playlists can be used too)</CODE></TD></TR> + <TR><TD></TD><TD>WWW</TD><TD></TD><TD><CODE>mplayer [options] http://site.com/file.asf (playlists can be used, too)</CODE></TD></TR> + <TR><TD></TD><TD>RTSP</TD><TD></TD><TD><CODE>mplayer [options] rtsp://server.example.com/streamName</CODE></TD></TR> </TABLE> <P> - Latest versions of MPlayer also accepts VCD and DVD tracks in URL style, just like - Xine does: <CODE>mplayer dvd://1</CODE> or <CODE>mplayer vcd://1</CODE></P> + Latest versions of MPlayer also accept VCD and DVD tracks in URL style, just like + xine does: <CODE>mplayer dvd://1</CODE> or <CODE>mplayer vcd://1</CODE></P> <PRE> mplayer -vo x11 /mnt/Films/Contact/contact2.mpg @@ -1223,7 +1227,8 @@ end <H2><A NAME="streaming">3.3 Streaming from network or pipes</A></H2> -<P><B>MPlayer</B> can play files from network, using the HTTP or MMS protocol.</P> +<P><B>MPlayer</B> can play files from network, using the HTTP, MMS or RTSP/RTP + protocol.</P> <P>Playing goes by simply using adding the URL to the command line. <B>MPlayer</B> also honors the http_proxy environment variable, and uses diff --git a/DOCS/formats.html b/DOCS/formats.html index fd34c9f652..0881d846d5 100644 --- a/DOCS/formats.html +++ b/DOCS/formats.html @@ -216,6 +216,14 @@ before compiling <B>MPlayer</B> to be able to play it.</P> +<H4><A NAME="sdp">2.1.1.13 SDP files</A></H4> + +<P><A HREF="ftp://ftp.rfc-editor.org/in-notes/rfc2327.txt">SDP</A> + is an IETF standard format for describing video and/or audio RTP streams. + (The "<A HREF="http://www.live.com/mplayer/">LIVE.COM Streaming Media</A>" + libraries are required.)</P> + + <H3><A NAME="audio_formats">2.1.2 Audio formats</A></H3> <P><B>MPlayer</B> is a <B>Movie</B> and not a <B>Media</B> player, although diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1 index 36071eff25..b01fa5a365 100644 --- a/DOCS/mplayer.1 +++ b/DOCS/mplayer.1 @@ -271,6 +271,10 @@ Play files according to a playlist (1 file per row or Winamp or ASX format). .B \-quiet \ \ Display less output and status messages. .TP +.B \-sdp +Specifies that the input file is a SDP ('Session Description Protocol') +file that describes an RTP session (see http://www.live.com/mplayer/). +.TP .B \-skin <skin\ directory> (BETA CODE) Load skin from the given directory (WITHOUT path name). @@ -542,6 +546,12 @@ fourcc in hex .PD 1 . .TP +.B \-rtsp-stream-over-tcp +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/). +.TP .B \-skipopening Skip DVD opening (dvdnav only). .TP @@ -2606,6 +2616,9 @@ mplayer \-dvdauth /dev/\:dvd /mnt/\:dvd/\:VIDEO_TS/\:VTS_02_4.VOB .B Stream from HTTP mplayer http://mplayer.hq/\:example.avi .TP +.B Stream using RTSP +mplayer rtsp://server.example.com/\:streamName +.TP .B Convert subtitle to MPsub (to ./\:dump.mpsub) mplayer dummy.avi \-sub source.sub \-dumpmpsub .TP |