diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-05-25 19:29:33 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-05-25 19:29:33 +0000 |
commit | 4303f20f81550dc1d487bd61f0f7b418581a318e (patch) | |
tree | bbacdbc210b8f0290155ae7273786df4659e743b | |
parent | 5ae30bf4e5d2e9b8e5d2385b07006a55d1f50b0b (diff) |
Changed a few remaining -dvd and -vcd options to dvd:// and vcd://.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10187 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | DOCS/en/cd-dvd.html | 12 | ||||
-rw-r--r-- | DOCS/en/documentation.html | 14 | ||||
-rw-r--r-- | DOCS/en/encoding.html | 18 | ||||
-rw-r--r-- | DOCS/en/formats.html | 2 |
4 files changed, 21 insertions, 25 deletions
diff --git a/DOCS/en/cd-dvd.html b/DOCS/en/cd-dvd.html index b453093461..6dedd8b713 100644 --- a/DOCS/en/cd-dvd.html +++ b/DOCS/en/cd-dvd.html @@ -70,9 +70,9 @@ <P>For the complete list of available options, please read the man page. The Syntax for a standard Digital Versatile Disc (DVD) is as follows:</P> -<P><CODE>mplayer -dvd <track> [-dvd-device <device>]</CODE></P> +<P><CODE>mplayer dvd://<track> [-dvd-device <device>]</CODE></P> -<P>Example: <CODE>mplayer -dvd 1 -dvd-device /dev/hdc</CODE></P> +<P>Example: <CODE>mplayer dvd://1 -dvd-device /dev/hdc</CODE></P> <P>The default DVD device is <CODE>/dev/dvd</CODE>. If your setup differs, make a symlink or specify the correct device on the command line with the @@ -208,9 +208,9 @@ <P>For the complete list of available options, please read the man page. The Syntax for a standard Video CD (VCD) is as follows:</P> -<P><CODE>mplayer -vcd <track> [-cdrom-device <device>]</CODE></P> +<P><CODE>mplayer vcd://<track> [-cdrom-device <device>]</CODE></P> -<P>Example: <CODE>mplayer -vcd 2 -cdrom-device /dev/hdc</CODE></P> +<P>Example: <CODE>mplayer vcd://2 -cdrom-device /dev/hdc</CODE></P> <P>The default VCD device is <CODE>/dev/cdrom</CODE>. If your setup differs, make a symlink or specify the correct device on the command line with the @@ -238,7 +238,7 @@ containing one MPEG PS data packet per sector instead of a filesystem. Similar to audio CD tracks, these tracks <B>cannot be mounted</B> (Did you ever mount an audio CD to play it?). As most movies are inside this track, - you should try <CODE>-vcd 2</CODE> first.</LI> + you should try <CODE>vcd://2</CODE> first.</LI> <LI>There exist VCD disks without the first track (single track and no filesystem at all). They are still playable, but cannot be mounted.</LI> </UL> @@ -256,7 +256,7 @@ the raw tracks through this shadow .DAT file. If you mount the disc using their driver, you can copy and even play .DAT files with mplayer. But it <B>will not work</B> with the standard iso9660 driver of the Linux kernel! - Use the <CODE>-vcd</CODE> option instead. Alternatives for VCD copying are + Use <CODE>vcd://</CODE> instead. Alternatives for VCD copying are the new <A HREF="http://www.elis.rug.ac.be/~ronsse/cdfs/">cdfs</A> kernel driver (not part of the official kernel) that shows CD <I>sessions</I> as image files and <A HREF="http://cdrdao.sourceforge.net/">cdrdao</A>, a diff --git a/DOCS/en/documentation.html b/DOCS/en/documentation.html index 0bad5d96b2..fe120008fc 100644 --- a/DOCS/en/documentation.html +++ b/DOCS/en/documentation.html @@ -1329,21 +1329,17 @@ are just a few tips: <TABLE BORDER=0> <TR><TD> </TD><TD>file</TD><TD> </TD><TD><CODE>mplayer [options] [path/]filename</CODE></TD></TR> <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>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>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 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 - mplayer -vcd 2 + mplayer vcd://2 -cdrom-device /dev/hdc mplayer -afm 3 /mnt/DVDtrailers/alien4.vob - mplayer -dvd 1 -dvd-device /dev/hdc + mplayer dvd://1 -dvd-device /dev/hdc mplayer -abs 65536 -delay -0.4 -nobps ~/movies/test.avi </PRE> @@ -1850,7 +1846,7 @@ end <P>DVDs also work, just set the DVD device correctly to whatever your CD-ROM device is:</P> -<P><CODE>mplayer -dvd <title> -dvd-device '\\.\d:'</CODE></P> +<P><CODE>mplayer dvd://<title> -dvd-device '\\.\d:'</CODE></P> <P>QuickTime DLLs have also been reported to work. Compile with <CODE>--enable-qtx-codecs</CODE> and put the codecs into the diff --git a/DOCS/en/encoding.html b/DOCS/en/encoding.html index b56915a6a8..4f6d30f96d 100644 --- a/DOCS/en/encoding.html +++ b/DOCS/en/encoding.html @@ -39,9 +39,9 @@ <CODE> rm frameno.avi</CODE> - remove this file, which can come from a previous 3-pass encoding (it interferes with current one)<BR> - <CODE> mencoder -dvd 2 -ovc lavc -lavcopts + <CODE> mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o movie.avi<BR> - mencoder -dvd 2 -ovc lavc -lavcopts + mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE></P> <P><U><B>3-pass encoding:</B></U> this is an extension of 2-pass encoding, @@ -79,11 +79,11 @@ <P><CODE> rm frameno.avi</CODE> - remove this file, which can come from a previous 3-pass encoding (it interferes with current one)<BR> - <CODE> mencoder -dvd 2 -ovc frameno + <CODE> mencoder dvd://2 -ovc frameno -o frameno.avi -oac mp3lame -lameopts vbr=3<BR> - mencoder -dvd 2 -ovc lavc + mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o movie.avi<BR> - mencoder -dvd 2 -ovc lavc + mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE></P> @@ -193,7 +193,7 @@ <CODE>vcodec</CODE> config, like: <CODE>-lavcopts vcodec=msmpeg4</CODE></P> <P>An example, with MJPEG compression:<BR> - <CODE> mencoder -dvd 2 -o title2.avi -ovc lavc + <CODE> mencoder dvd://2 -o title2.avi -ovc lavc -lavcopts vcodec=mjpeg -oac copy</CODE></P> @@ -275,10 +275,10 @@ Explanation of the process: <P><I>Copying two subtitles from a DVD while doing 3-pass encoding</I><BR> <CODE>rm subtitles.idx subtitles.sub</CODE><BR> - <CODE>mencoder -dvd 1 -vobsubout subtitles -vobsuboutindex 0 + <CODE>mencoder dvd://1 -vobsubout subtitles -vobsuboutindex 0 -sid 2 -o frameno.avi -ovc frameno -oac mp3lame -lameopts vbr=3</CODE><BR> - <CODE>mencoder -dvd 1 -oac copy -ovc divx4 -divx4opts pass=1</CODE><BR> - <CODE>mencoder -dvd 1 -oac copy -ovc divx4 -divx4opts pass=2 -vobsubout + <CODE>mencoder dvd://1 -oac copy -ovc divx4 -divx4opts pass=1</CODE><BR> + <CODE>mencoder dvd://1 -oac copy -ovc divx4 -divx4opts pass=2 -vobsubout subtitles -vobsuboutindex 1 -sid 5</CODE></P> <P><I>Copying a french subtitle from an MPEG file</I><BR> diff --git a/DOCS/en/formats.html b/DOCS/en/formats.html index 35303680f8..d51ecb2f6e 100644 --- a/DOCS/en/formats.html +++ b/DOCS/en/formats.html @@ -44,7 +44,7 @@ <LI>DAT: This is the very same format as MPG with a different extension. It is used on <B>Video CD</B>s. Due to the way VCDs are created and Linux is designed, DAT files cannot be played nor copied from VCDs as regular files. - You have to use the <CODE>-vcd</CODE> option to play the Video CD.</LI> + You have to use <CODE>vcd://</CODE> to play a Video CD.</LI> <LI>VOB: This is the MPEG file format on <B>DVD</B>s. It is the same as MPG, plus the capability to contain subtitles or non-MPEG (AC3) audio. It contains encoded MPEG2 video and usually AC3 audio, but DTS, MP2 and |