aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar jonas <jonas@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-07-09 20:10:48 +0000
committerGravatar jonas <jonas@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-07-09 20:10:48 +0000
commitd7bf90d3c08d300a59f935ca6583aaa210c29f68 (patch)
tree2016f99cdec030f12756edb73bb306aa0941481d
parent5eda57a19b8793e7544e2e267551140d69bc23f1 (diff)
-dvd -> dvd:// and -vcd -> vcd://
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10406 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--DOCS/de/cd-dvd.html10
-rw-r--r--DOCS/de/documentation.html10
-rw-r--r--DOCS/de/encoding.html18
-rw-r--r--DOCS/de/mplayer.124
-rw-r--r--DOCS/hu/cd-dvd.html6
-rw-r--r--DOCS/hu/documentation.html10
-rw-r--r--DOCS/hu/encoding.html18
-rw-r--r--DOCS/hu/mplayer.124
-rw-r--r--DOCS/it/cd-dvd.html12
-rw-r--r--DOCS/it/documentation.html10
-rw-r--r--DOCS/it/encoding.html18
-rw-r--r--DOCS/pl/cd-dvd.html6
-rw-r--r--DOCS/pl/documentation.html8
-rw-r--r--DOCS/pl/encoding.html18
-rw-r--r--DOCS/pl/mplayer.124
-rw-r--r--DOCS/tech/encoding-tips.txt6
-rw-r--r--DOCS/zh/cd-dvd.html10
-rw-r--r--DOCS/zh/documentation.html10
-rw-r--r--DOCS/zh/encoding.html18
-rw-r--r--DOCS/zh/mplayer.124
-rw-r--r--README4
-rwxr-xr-xTOOLS/dvd2divxscript.pl2
-rwxr-xr-xTOOLS/mencvcd4
-rw-r--r--help/help_mp-bg.h4
-rw-r--r--help/help_mp-cs.h4
-rw-r--r--help/help_mp-de.h4
-rw-r--r--help/help_mp-dk.h4
-rw-r--r--help/help_mp-el.h4
-rw-r--r--help/help_mp-en.h4
-rw-r--r--help/help_mp-es.h4
-rw-r--r--help/help_mp-fr.h4
-rw-r--r--help/help_mp-hu.h4
-rw-r--r--help/help_mp-it.h4
-rw-r--r--help/help_mp-ko.h4
-rw-r--r--help/help_mp-nl.h4
-rw-r--r--help/help_mp-no.h4
-rw-r--r--help/help_mp-pl.h4
-rw-r--r--help/help_mp-pt_BR.h4
-rw-r--r--help/help_mp-ro.h4
-rw-r--r--help/help_mp-ru.h4
-rw-r--r--help/help_mp-sk.h4
-rw-r--r--help/help_mp-tr.h4
-rw-r--r--help/help_mp-uk.h4
-rw-r--r--help/help_mp-zh_CN.h4
-rw-r--r--help/help_mp-zh_TW.h4
-rw-r--r--libmpdemux/dvdauth.c2
46 files changed, 192 insertions, 192 deletions
diff --git a/DOCS/de/cd-dvd.html b/DOCS/de/cd-dvd.html
index 6dd0ef553b..56ceaae7ad 100644
--- a/DOCS/de/cd-dvd.html
+++ b/DOCS/de/cd-dvd.html
@@ -80,9 +80,9 @@ HREF="http://das.ist.org/~georg/">Plextor-SCSI-Laufwerken</A> funktioniert.</P>
verf&uuml;gbaren Optionen willst. Die Syntax bei einer normalen Digital
Versatile Disc (DVD) sieht wie folgt aus:</P>
-<P><CODE>mplayer -dvd &lt;track&gt; [-dvd-device &lt;Ger&auml;t&gt;]</CODE></P>
+<P><CODE>mplayer dvd://&lt;track&gt; [-dvd-device &lt;Ger&auml;t&gt;]</CODE></P>
-<P>Beispiel: <CODE>mplayer -dvd 1 -dvd-device /dev/hdc</CODE></P>
+<P>Beispiel: <CODE>mplayer dvd://1 -dvd-device /dev/hdc</CODE></P>
<P>Das Standard-DVD-Ger&auml;t ist <CODE>/dev/dvd</CODE>. Wenn das bei dir
anders ist, so erstelle einen symbolischen Link auf das richtige Ger&auml;t,
@@ -256,11 +256,11 @@ nur unter Linux). <B>Warnung:</B> Du kannst nur f&uuml;nf mal den Gebietscode
<P><B>Abspielen von Standard Video-CDs:</B></P>
-<P><CODE>mplayer -vcd &lt;Tracknummer&gt; [-cdrom-device
+<P><CODE>mplayer vcd://&lt;Tracknummer&gt; [-cdrom-device
&lt;Ger&auml;t&gt;]</CODE></P>
<P>Beispiele:<BR>
-<CODE>mplayer -vcd 2 -cdrom-device /dev/hdc</CODE><BR></P>
+<CODE>mplayer vcd://2 -cdrom-device /dev/hdc</CODE><BR></P>
<P>Das Standard-CD-Rom-Laufwerk ist <CODE>/dev/cdrom</CODE>. Falls das bei dir
nicht der Fall ist, erstelle einen symbolischen Link oder gib das richtige
@@ -291,7 +291,7 @@ Daten von der VCD extrahieren und diese mit MPlayer abspielen.</P>
enthalten. &Auml;hnlich wie bei Audio-CDs k&ouml;nnen diese Spuren
<B>nicht gemountet</B> werden (hast du jemals eine Audio-CD gemountet,
um sie abzuspielen?). Da die meisten Filme sich auf der zweiten Spur
- befinden, solltest du zuerst <CODE>-vcd 2</CODE> ausprobieren.</LI>
+ befinden, solltest du zuerst <CODE>vcd://2</CODE> ausprobieren.</LI>
<LI>Es existieren auch VCDs ohne die erste Spur (nur eine Spur, &uuml;berhaupt
kein Dateisystem). Diese lassen sich abspielen aber nicht mounten.</LI>
</UL>
diff --git a/DOCS/de/documentation.html b/DOCS/de/documentation.html
index 95a730cd36..41d9dc85a2 100644
--- a/DOCS/de/documentation.html
+++ b/DOCS/de/documentation.html
@@ -1475,8 +1475,8 @@ nach dem Dateinamen, welche nur f&uuml;r die jeweilige Datei/URL/etc gelten
<TABLE BORDER=0>
<TR><TD>&nbsp;&nbsp;</TD><TD>Datei</TD><TD>&nbsp;&nbsp;</TD><TD><CODE>mplayer [Optionen] [Pfad/]Dateiname</CODE></TD></TR>
<TR><TD></TD><TD>Datei</TD><TD></TD><TD><CODE>mplayer [standard Optionen] [Pfad/]Dateiname [Optionen f&uuml;r datei1] datei2 datei3 [Optionen f&uuml;r datei3]</CODE></TD></TR>
- <TR><TD></TD><TD>VCD</TD><TD></TD><TD><CODE>mplayer [Optionen] -vcd Tracknr [-cdrom-device /dev/cdrom]</CODE></TD></TR>
- <TR><TD></TD><TD>DVD</TD><TD></TD><TD><CODE>mplayer [Optionen] -dvd Titelnr [-dvd-device /dev/dvd]</CODE></TD></TR>
+ <TR><TD></TD><TD>VCD</TD><TD></TD><TD><CODE>mplayer [Optionen] vcd://Tracknr [-cdrom-device /dev/cdrom]</CODE></TD></TR>
+ <TR><TD></TD><TD>DVD</TD><TD></TD><TD><CODE>mplayer [Optionen] dvd://Titelnr [-dvd-device /dev/dvd]</CODE></TD></TR>
<TR><TD></TD><TD>Netz</TD><TD></TD><TD><CODE>mplayer [Optionen] http://site.com/datei.asf (playlist kann auch benutzt werden)</CODE></TD></TR>
</TABLE>
@@ -1486,9 +1486,9 @@ oder <CODE>mplayer vcd://1</CODE></P>
<PRE>
mplayer -vo x11 /mnt/Filme/Contact/contact2.mpg
- mplayer -vcd 2
+ mplayer vcd://2
mplayer -afm 3 /mnt/DVDtrailers/alien4.vob
- mplayer -dvd 1
+ mplayer dvd://1
mplayer -abs 65536 -delay -0.4 -nobps ~/movies/test.avi
</PRE>
@@ -2040,7 +2040,7 @@ anzeigt. So funktioniert es (pass bei Bedarf den Laufwerksbuchstaben an):</P>
<P>DVDs funktionieren ebenfalls. Setze daf&uuml;r einfach dsa DVD-Ger&auml;t
korrekt:</P>
-<P><CODE>mplayer -dvd &lt;Titel&gt; -dvd-device '\\.\d:'</CODE></P>
+<P><CODE>mplayer dvd://&lt;Titel&gt; -dvd-device '\\.\d:'</CODE></P>
<P>Die QuickTime-DLLs sollen angeblich ebenfalls funktionieren. Compiliere
MPlayer mit <CODE>--enable-qtx-codecs</CODE> und kopiere die Codecs an den
diff --git a/DOCS/de/encoding.html b/DOCS/de/encoding.html
index 1818dfb70b..0b5992bf95 100644
--- a/DOCS/de/encoding.html
+++ b/DOCS/de/encoding.html
@@ -43,10 +43,10 @@ einige Guides im Internet lesen.</P>
welche von einer fr&uuml;heren 3-Pass-Encodierung kommen kann (Sie f&uuml;hrt zu
einem Konflikt mit der momentanen Encodierung).<BR>
-<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -lavcopts
+<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -lavcopts
vcodec=mpeg4:vpass=1 -oac copy -o film.avi</CODE><BR>
-<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -lavcopts
+<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -lavcopts
vcodec=mpeg4:vpass=2 -oac copy -o film.avi</CODE></P>
<P><U><B>3-Pass-Encodierung:</B></U> Dies ist eine Erweiterung der
@@ -93,13 +93,13 @@ encodiert. Das Schema: </P>
welche von einer fr&uuml;heren 3-Pass-Encodierung kommen kann (Sie f&uuml;hrt
zu einem Konflikt mit der momentanen Encodierung).<BR>
-<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc frameno
+<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc frameno
-o frameno.avi -oac mp3lame -lameopts vbr=3<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc
+&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc
-lavcopts vcodec=mpeg4:vpass=1 -oac copy -o movie.avi<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc
+&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc
-lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE></P>
@@ -219,7 +219,7 @@ Codecs encodieren:</P>
<CODE>-lavcopts vcodec=msmpeg4</CODE></P>
<P>Ein Beispiel mit MJPEG-Compression:<BR>
-<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -o titel2.avi -ovc lavc -lavcopts
+<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -o titel2.avi -ovc lavc -lavcopts
vcodec=mjpeg -oac copy</CODE></P>
<H3><A NAME="image_files">7.7 Encodierung von mehreren Einzelbildern
@@ -317,13 +317,13 @@ also vor dem Starten gel&ouml;scht werden.</P>
&nbsp;&nbsp;<CODE>rm untertitel.idx untertitel.sub</CODE><BR>
-&nbsp;&nbsp;<CODE>mencoder -dvd 1 -vobsubout untertitel -vobsuboutindex 0 -sid
+&nbsp;&nbsp;<CODE>mencoder dvd://1 -vobsubout untertitel -vobsuboutindex 0 -sid
2 -o frameno.avi -ovc frameno -oac mp3lame -lameopts vbr=3</CODE><BR>
-&nbsp;&nbsp;<CODE>mencoder -dvd 1 -oac copy -ovc divx4 -divx4opts
+&nbsp;&nbsp;<CODE>mencoder dvd://1 -oac copy -ovc divx4 -divx4opts
pass=1</CODE><BR>
-&nbsp;&nbsp;<CODE>mencoder -dvd 1 -oac copy -ovc divx4 -divx4opts pass=2
+&nbsp;&nbsp;<CODE>mencoder dvd://1 -oac copy -ovc divx4 -divx4opts pass=2
-vobsubout untertitel -vobsuboutindex 1 -sid 5</CODE></P>
diff --git a/DOCS/de/mplayer.1 b/DOCS/de/mplayer.1
index 7183b20014..e92f85e2bd 100644
--- a/DOCS/de/mplayer.1
+++ b/DOCS/de/mplayer.1
@@ -539,7 +539,7 @@ oder Streams zu rippen, die über's Netzwerk abgespielt werden.
Schreibt den unbehandelten, komprimierten Videostream nach ./\:stream.dump
(nicht sehr nützlich).
.TP
-.B \-dvd <Titel\-ID>
+.B \dvd://<Titel\-ID>
Gibt an, welche Filme (durch die Titel-ID spezifiziert) abgespielt werden
sollen. Beispielsweise ist '1' eine Vorschau und '2' der tatsächliche Film.
@@ -831,7 +831,7 @@ für mplayer).
.B \-user <Benutzername> (siehe auch \-passwd)
Gibt den Benutzernamen für die HTTP-Authentifizierung an.
.TP
-.B \-vcd <Titel>
+.B \vcd://<Titel>
Spielt den Video\-CD\-Titel direkt von einem Gerät oder einem Diskabbild
ab (siehe \-cuefile).
.TP
@@ -3521,19 +3521,19 @@ Film namens /mnt/\:cdrom/\:film.avi):
.SH BEISPIELE
.TP
.B Simples Kommando für DVD
-mplayer \-dvd 1
+mplayer \dvd://1
.TP
.B Audio auf japanisch mit englischen Untertiteln
-mplayer \-dvd 1 \-alang ja \-slang en
+mplayer \dvd://1 \-alang ja \-slang en
.TP
.B Spiele nur Kapitel 5, 6, 7
-mplayer \-dvd 1 \-chapter 5\-7
+mplayer \dvd://1 \-chapter 5\-7
.TP
.B bei DVDs mit mehreren Kameraperspektiven
-mplayer \-dvd 1 \-dvdangle 2
+mplayer \dvd://1 \-dvdangle 2
.TP
.B Abspielen von einem anderen DVD\-Gerät
-mplayer \-dvd 1 \-dvd\-device /dev/\:dvd2
+mplayer \dvd://1 \-dvd\-device /dev/\:dvd2
.TP
.B Abspielen mit alter DVD\-Unterstützung (VOB)
mplayer \-dvdauth /dev/\:dvd /mnt/\:dvd/\:VIDEO_TS/\:VTS_02_4.VOB
@@ -3552,21 +3552,21 @@ mplayer \-tv on:driver=v4l:width=640:height=480:outfmt=i420 \-vc rawi420
\-vo xv
.TP
.B Encodiere Titel Nr. 2 der DVD, aber nur ausgewählte Kapitel
-mencoder \-dvd 2 \-chapter 10-15 \-o title2.avi \-oac copy \-ovc divx4
+mencoder \dvd://2 \-chapter 10-15 \-o title2.avi \-oac copy \-ovc divx4
.TP
.B Encodiere Titel Nr. 2 der DVD und skaliere auf 640x480
-mencoder \-dvd 2 \-vf scale=640:480 \-o title2.avi \-oac copy \-ovc divx4
+mencoder \dvd://2 \-vf scale=640:480 \-o title2.avi \-oac copy \-ovc divx4
.TP
.B Encodiere Titel Nr. 2 der DVD und skaliere auf 512xHHH unter Beibehaltung des Höhen\-/\:Breitenverhältnisses
-mencoder \-dvd 2 \-vf scale \-zoom \-xy 512 \-o title2.avi \-oac copy
+mencoder \dvd://2 \-vf scale \-zoom \-xy 512 \-o title2.avi \-oac copy
\-ovc divx4
.TP
.B Das gleiche, aber mit libavcodecs MPEG4\-Codec
-mencoder \-dvd 2 \-o title2.avi \-ovc lavc
+mencoder \dvd://2 \-o title2.avi \-ovc lavc
\-lavcopts vcodec=mpeg4:vhq:vbitrate=1800 \-oac copy
.TP
.B Das gleiche, aber mit libavcodecs MJPEG\-Codec
-mencoder \-dvd 2 \-o titel2.avi \-ovc lavc
+mencoder \dvd://2 \-o titel2.avi \-ovc lavc
\-lavcopts vcodec=mjpeg:vhq:vbitrate=1800 \-oac copy
.TP
.B Encodiere alls .jpg\-Dateien im aktuellen Verzeichnis
diff --git a/DOCS/hu/cd-dvd.html b/DOCS/hu/cd-dvd.html
index 88e0ffbe5a..dc8a96d9c4 100644
--- a/DOCS/hu/cd-dvd.html
+++ b/DOCS/hu/cd-dvd.html
@@ -63,9 +63,9 @@
<P>A rendelkezésre álló opciók teljes listája a man page-ben tekinthetõ
meg. Egy szabványos DVD lemez lejátszása a következõképpen történik:</P>
-<P><CODE>mplayer -dvd &lt;sáv&gt; [-dvd-device &lt;egység&gt;]</CODE></P>
+<P><CODE>mplayer dvd://&lt;sáv&gt; [-dvd-device &lt;egység&gt;]</CODE></P>
-<P>Például: <CODE>mplayer -dvd 1 -dvd-device /dev/hdc</CODE></P>
+<P>Például: <CODE>mplayer dvd://1 -dvd-device /dev/hdc</CODE></P>
<P>Az alapértelmezett DVD egység a <CODE>/dev/dvd</CODE>. Ha a rendszered ettõl
különbözik, egy megfelelõ symlink-kel, vagy a <CODE>-dvd-device</CODE>
@@ -245,7 +245,7 @@
MPEG (film) sávog, mindegyik egy-egy MPEG-PS adat/sector-t tartalmaz
filerendszer helyett. Hasonlóan az audio CD sávokhoz, ezeket a sávokat
<B>sem lehet mountolni</B> (Mountoltál már valaha audio CD-t hogy
- lejátszd?). Mivel a legtöbb film ebben a sávban van, a <CODE>-vcd 2</CODE>
+ lejátszd?). Mivel a legtöbb film ebben a sávban van, a <CODE>vcd://2</CODE>
opciót kell használnod.</LI>
<LI>Léteznek VCD lemezek amelyeken nincs rajta az elsõ sáv (tehát csak
egyetlen sávot tartalmaznak, filerendszer nélkül). Ezek is lejátszhatóak,
diff --git a/DOCS/hu/documentation.html b/DOCS/hu/documentation.html
index 40ac621fcd..c9a996a7a3 100644
--- a/DOCS/hu/documentation.html
+++ b/DOCS/hu/documentation.html
@@ -1283,8 +1283,8 @@ Szabványos V4L-rõl bemenet<BR>
<P><TABLE BORDER=0>
<TR><TD>&nbsp;&nbsp;</TD><TD>file</TD><TD>&nbsp;&nbsp;</TD><TD><CODE>mplayer [opciók] [útvonal/]filenév</CODE></TD></TR>
<TR><TD></TD><TD>file-ok</TD><TD></TD><TD><CODE>mplayer [opciók] [útvonal/]filenév1 [filenév1 opciói] filenév2 [filenév2 opciói] ...</CODE></TD></TR>
-<TR><TD></TD><TD>VCD</TD><TD></TD><TD><CODE>mplayer [opciók] -vcd trackszám [-cdrom-device /dev/cdrom]</CODE></TD></TR>
-<TR><TD></TD><TD>DVD</TD><TD></TD><TD><CODE>mplayer [opciók] -dvd titleno [-dvd device /dev/dvd]</CODE></TD></TR>
+<TR><TD></TD><TD>VCD</TD><TD></TD><TD><CODE>mplayer [opciók] vcd://trackszám [-cdrom-device /dev/cdrom]</CODE></TD></TR>
+<TR><TD></TD><TD>DVD</TD><TD></TD><TD><CODE>mplayer [opciók] dvd://titleno [dvd://device /dev/dvd]</CODE></TD></TR>
<TR><TD></TD><TD>net</TD><TD></TD><TD><CODE>mplayer [opciók] http://site.com/file.[mpg|avi|asf] (lejátszási listák is használhatóak)</CODE></TD></TR>
</TABLE></P>
@@ -1294,9 +1294,9 @@ Szabványos V4L-rõl bemenet<BR>
</P>
<P><PRE> mplayer -vo x11 /mnt/Films/Contact/contact2.mpg
- mplayer -vcd 2
+ mplayer vcd://2
mplayer -afm 3 /mnt/DVDtrailers/alien4.vob
- mplayer -dvd 1 -dvd-device /dev/dvd
+ mplayer dvd://1 -dvd-device /dev/dvd
mplayer -abs 65536 -delay -0.4 -nobps ~/movies/test.avi</PRE></P>
@@ -1736,7 +1736,7 @@ end
<P>A DVD-k is mûködnek, csak helyesen kell megadni a DVD egység nevét:</P>
-<P><CODE>mplayer -dvd &lt;sáv&gt; -dvd-device '\\.\d:'</CODE></P>
+<P><CODE>mplayer dvd://&lt;sáv&gt; -dvd-device '\\.\d:'</CODE></P>
<P>A QuickTime DLL-ek is mûködnek, ha a DLL-ed keresési útvonalba
berakod õket: <CODE>c:\winnt\system32</CODE> vagy
diff --git a/DOCS/hu/encoding.html b/DOCS/hu/encoding.html
index 97e487c8f5..6b09b480a9 100644
--- a/DOCS/hu/encoding.html
+++ b/DOCS/hu/encoding.html
@@ -35,9 +35,9 @@
mutatja be. Csak két parancs szükséges:<BR>
<CODE>&nbsp;&nbsp;&nbsp;&nbsp;rm frameno.avi</CODE> - töröld ezt a file-t,
ami egy esetleges elõzõ 3 menetes enkódolásból származhat<BR>
- <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc -lavcopts
+ <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc -lavcopts
vcodec=mpeg4:opciók -oac copy -o film.avi -pass 1<BR>
- <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc -lavcopts
+ <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc -lavcopts
vcodec=mpeg4:opciók -oac copy -o film.avi -pass 2<BR>
<P><U><B>3 menetes enkódolás:</B></U> ez egyfajta bõvített kétmenetes
@@ -78,11 +78,11 @@
<P><CODE>&nbsp;&nbsp;&nbsp;&nbsp;rm frameno.avi</CODE> - esetlegesen egy elõzõ
enkódolásbol származó file törlése (bezavar a most következõnek)<BR>
- <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc frameno
+ <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc frameno
-o frameno.avi -oac mp3lame -lameopts vbr=3:opciók<BR>
- &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc
+ &nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc
-lavcopts vcodec=mpeg4:vbitrate=1100 -oac copy -o movie.avi -pass 1<BR>
- &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc
+ &nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc
-lavcopts vcodec=mpeg4:vbitrate=1100 -oac copy -o movie.avi -pass 2</CODE>
</P>
@@ -193,7 +193,7 @@
<CODE>vcodec</CODE> opciónak, pl: <CODE>-lavcopts vcodec=msmpeg4</CODE></P>
<P>Egy példa, MJPEG tömörítéssel:<BR>
- <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -o title2.avi -ovc lavc
+ <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -o title2.avi -ovc lavc
-lavcopts vcodec=mjpeg -oac copy</CODE></P>
@@ -267,10 +267,10 @@
<P><I>Két felirat másolása DVD-rõl, 3 menetes enkódolás közben</I><BR>
&nbsp;&nbsp;<CODE>rm subtitles.idx subtitles.sub</CODE><BR>
- &nbsp;&nbsp;<CODE>mencoder -dvd 1 -vobsubout subtitles -vobsuboutindex 0
+ &nbsp;&nbsp;<CODE>mencoder dvd://1 -vobsubout subtitles -vobsuboutindex 0
-sid 2 -o frameno.avi -ovc frameno -oac mp3lame -lameopts vbr=3</CODE><BR>
- &nbsp;&nbsp;<CODE>mencoder -dvd 1 -oac copy -ovc divx4 -pass 1</CODE><BR>
- &nbsp;&nbsp;<CODE>mencoder -dvd 1 -oac copy -ovc divx4 -pass 2 -vobsubout
+ &nbsp;&nbsp;<CODE>mencoder dvd://1 -oac copy -ovc divx4 -pass 1</CODE><BR>
+ &nbsp;&nbsp;<CODE>mencoder dvd://1 -oac copy -ovc divx4 -pass 2 -vobsubout
subtitles -vobsuboutindex 1 -sid 5</CODE></P>
<P><I>Francia nyelvû felirat másolása MPEG-bõl</I><BR>
diff --git a/DOCS/hu/mplayer.1 b/DOCS/hu/mplayer.1
index 7b56076e30..314a421bde 100644
--- a/DOCS/hu/mplayer.1
+++ b/DOCS/hu/mplayer.1
@@ -508,7 +508,7 @@ Hasznos DVD rippeléshez, vagy hálozati lejátszáshoz.
Nyers, tömörítetlen video stream kiírása a ./\:stream.dump file-ba
(nem túl hasznos)
.TP
-.B \-dvd <cím\ id>
+.B \dvd://<cím\ id>
Megadja az MPlayernek hogy mely ID-vel ellátott filmeket játssza le.
Például néha az '1'-es egy elõzetes, és a '2'-es az igazi film.
@@ -783,7 +783,7 @@ külsõ kábelen fog menni.
.B \-user <felhasználóné> (lásd a \-passwd opciót)
Felhasználónév megadása HTTP autentikációhoz.
.TP
-.B \-vcd <sáv>
+.B \vcd://<sáv>
Megadott video CD sáv lejátszása egységrõl, vagy image fileból
(lásd a \-cuefile opciót)
.TP
@@ -3333,19 +3333,19 @@ A felirat file-ok keresési sorrendje a következõ (a példa film
.SH PÉLDÁK
.TP
.B DVD lejátszás indítása
-mplayer \-dvd 1
+mplayer \dvd://1
.TP
.B Japán hanggal, és angol felirattal
-mplayer \-dvd 1 \-alang ja \-slang en
+mplayer \dvd://1 \-alang ja \-slang en
.TP
.B Csak az 5, 6, 7 fejezetek lejátszása
-mplayer \-dvd 1 \-chapter 5\-7
+mplayer \dvd://1 \-chapter 5\-7
.TP
.B Más nézõpont kiválasztása
-mplayer \-dvd 1 \-dvdangle 2
+mplayer \dvd://1 \-dvdangle 2
.TP
.B Más DVD egység használata
-mplayer \-dvd 1 \-dvd\-device /dev/\:dvd2
+mplayer \dvd://1 \-dvd\-device /dev/\:dvd2
.TP
.B Régi tipusú DVD (VOB) lejátszás
mplayer \-dvdauth /dev/\:dvd /mnt/\:dvd/\:VIDEO_TS/\:VTS_02_4.VOB
@@ -3364,22 +3364,22 @@ mplayer \-tv on:driver=v4l:width=640:height=480:outfmt=i420 \-vc rawi420
\-vo xv
.TP
.B DVD 2-es sávjának enkódolása, csak a kiválasztott fejezetekkel
-mencoder \-dvd 2 \-chapter 10-15 \-o title2.avi \-oac copy \-ovc divx4
+mencoder \dvd://2 \-chapter 10-15 \-o title2.avi \-oac copy \-ovc divx4
.TP
.B DVD 2-es sávjának enkódolása, átméretezés 640x480-ba
-mencoder \-dvd 2 \-vf scale=640:480 \-o title2.avi \-oac copy \-ovc divx4
+mencoder \dvd://2 \-vf scale=640:480 \-o title2.avi \-oac copy \-ovc divx4
.TP
.B DVD 2-es sávjának enkódolása, átméretezés 512xMMM-be (képarány
megtartásával)
-mencoder \-dvd 2 \-vf scale \-zoom \-xy 512 \-o title2.avi \-oac copy
+mencoder \dvd://2 \-vf scale \-zoom \-xy 512 \-o title2.avi \-oac copy
\-ovc divx4
.TP
.B Ugyanez, de a libavcodec-kel, MPEG4 tömörítéssel
-mencoder \-dvd 2 \-o title2.avi \-ovc lavc
+mencoder \dvd://2 \-o title2.avi \-ovc lavc
\-lavcopts vcodec=mpeg4:vhq:vbitrate=1800 \-oac copy
.TP
.B Ugyanez MJPEG-gel
-mencoder \-dvd 2 \-o titel2.avi \-ovc lavc
+mencoder \dvd://2 \-o titel2.avi \-ovc lavc
\-lavcopts vcodec=mjpeg:vhq:vbitrate=1800 \-oac copy
.TP
.B A jelenlegi könyvtárban lévõ összes *.jpg file enkódolása
diff --git a/DOCS/it/cd-dvd.html b/DOCS/it/cd-dvd.html
index f279a6c442..29b50462a5 100644
--- a/DOCS/it/cd-dvd.html
+++ b/DOCS/it/cd-dvd.html
@@ -64,9 +64,9 @@ CDROM.</P>
<P>Per la lista completa delle opzioni disponibili, leggete la pagina di man.
La sintassi per la riproduzione di un DVD standard è la seguente:</P>
-<P><CODE>mplayer -dvd &lt;track&gt; [-dvd-device &lt;device&gt;]</CODE></P>
+<P><CODE>mplayer dvd://&lt;track&gt; [-dvd-device &lt;device&gt;]</CODE></P>
-<P>Esempio:<CODE>mplayer -dvd 1 -dvd-device /dev/hdc</CODE></P>
+<P>Esempio:<CODE>mplayer dvd://1 -dvd-device /dev/hdc</CODE></P>
<P>Il dispositivo DVD predefinito è <CODE>/dev/dvd</CODE>. Se il tuo sistema è
diverso, crea un symlink o specifica il dispositivo corretto sulla linea di comando
@@ -203,10 +203,10 @@ con l'opzione <CODE>-dvd-device</CODE>.</P>
La sintassi per vedere i Video CD standard (VCD) è la seguente:</P>
<P>
-mplayer -vcd <I>numerotraccia</I> [-cdrom-device device]<BR><BR>
+mplayer vcd://<I>numerotraccia</I> [-cdrom-device device]<BR><BR>
Esempi:<BR>
-mplayer -vcd 1<BR>
-mplayer -fs -vcd 2 -cdrom-device /dev/hdc<BR>
+mplayer vcd://1<BR>
+mplayer -fs vcd://2 -cdrom-device /dev/hdc<BR>
</P>
<P><B>Nota:</B> Almeno i Plextor e alcuni CD-ROM SCSI della Toshiba hanno
@@ -232,7 +232,7 @@ e vedere il file risultante con MPlayer.</P>
film... Le tracce <B>non possono essere montate</B>! E' come con le tracce audio
(es. Tu non hai mai montato un cd audio per leggerlo, vero?).
Dato che di solito i film sono contenuti nella traccia due, dovresti provare
- l'opzione <CODE>-vcd 2</CODE> per prima.</LI>
+ l'opzione <CODE>vcd://2</CODE> per prima.</LI>
<LI>Esistono anche dischi VCD senza la prima traccia (traccia singola e privi
di qualunque filesystem). Sono sempre leggibili, ma non possono essere montati.</LI>
</UL>
diff --git a/DOCS/it/documentation.html b/DOCS/it/documentation.html
index b1756508f8..390faca0a2 100644
--- a/DOCS/it/documentation.html
+++ b/DOCS/it/documentation.html
@@ -1238,8 +1238,8 @@ Input da standard V4L<BR>
<P><TABLE BORDER=0>
<TD>&nbsp;&nbsp;</TD><TD>file</TD><TD>&nbsp;&nbsp;</TD><TD><CODE>mplayer [opzioni] [percorso/]nomefile</CODE></TD><TR>
<TD></TD><TD>file</TD><TD></TD><TD><CODE>mplayer [opzioni di default] [percorso/]nomefile1 [opzioni per nomefile1] nomefile2 [opzioni per nomefile2] ...</CODE></TD><TR>
-<TD></TD><TD>VCD</TD><TD></TD><TD><CODE>mplayer [opzioni] -vcd numtraccia [-cdrom-device /dev/cdrom]</CODE></TD><TR>
-<TD></TD><TD>DVD</TD><TD></TD><TD><CODE>mplayer [opzioni] -dvd numtitolo [-dvd-device /dev/dvd]</CODE></TD><TR>
+<TD></TD><TD>VCD</TD><TD></TD><TD><CODE>mplayer [opzioni] vcd://numtraccia [-cdrom-device /dev/cdrom]</CODE></TD><TR>
+<TD></TD><TD>DVD</TD><TD></TD><TD><CODE>mplayer [opzioni] dvd://numtitolo [-dvd-device /dev/dvd]</CODE></TD><TR>
<TD></TD><TD>rete</TD><TD></TD><TD><CODE>mplayer [opzioni] http://sito.com/file.[mpg|avi] (si possono usare anche playlist)</CODE></TD><TR>
<TR><TD></TD><TD>RTSP</TD><TD></TD><TD><CODE>mplayer [opzioni] rtsp://server.example.com/nomeStream</CODE></TD></TR>
</TABLE></P>
@@ -1250,9 +1250,9 @@ Xine: <CODE>mplayer dvd://1</CODE> o <CODE>mplayer vcd://1</CODE>
</P>
<P><PRE> mplayer -vo x11 /mnt/Films/Contact/contact2.mpg
- mplayer -vcd 2
+ mplayer vcd://2
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></P>
<H2><A NAME="control">3.2. Controllo</A></H2>
@@ -1739,7 +1739,7 @@ far compilare Mplayer.</P>
<P>Anche i DVD funzionano, basta impostare il dispositivo DVD con la lettera
del drive CD-ROM:</P>
-<P><CODE>mplayer -dvd &lt;title&gt; -dvd-device '\\.\d:'</CODE></P>
+<P><CODE>mplayer dvd://&lt;title&gt; -dvd-device '\\.\d:'</CODE></P>
<P>ci è stato riferito che le DLL di QuickTime sembrano funzionare. Compila con
<CODE>--enable-qtx-codecs</CODE> e metti i codec nella posizione predefinita
diff --git a/DOCS/it/encoding.html b/DOCS/it/encoding.html
index 29eb30ef94..45a7424f73 100644
--- a/DOCS/it/encoding.html
+++ b/DOCS/it/encoding.html
@@ -36,9 +36,9 @@ dovresti consultare alcune guide disponibili in rete.</P>
<CODE>&nbsp;&nbsp;&nbsp;&nbsp;rm frameno.avi</CODE> - rimuovi questo file che può essere rimasto
da una precedente codifica a 3 passaggi (interferisce col processo attuale)<BR>
-<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc -lavcopts
+<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc -lavcopts
vcodec=mpeg4:vpass=1 -oac copy -o movie.avi<BR>
- &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc -lavcopts
+ &nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc -lavcopts
vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE></P>
<P><U><B>codifica a 3 passaggi :</B></U> questa è un' estensione della codifica a 2 passaggi,
@@ -77,11 +77,11 @@ dovresti consultare alcune guide disponibili in rete.</P>
<P><CODE>&nbsp;&nbsp;&nbsp;&nbsp;rm frameno.avi</CODE> - rimuovi questo file,
che può essere rimasto da una precedente codifica a 3 passaggi (interferisce con quella attuale)<BR>
-<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc frameno
+<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc frameno
-o frameno.avi -oac mp3lame -lameopts vbr=3<BR>
- &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc
+ &nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc
-lavcopts vcodec=mpeg4:vpass=1 -oac copy -o movie.avi<BR>
- &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc
+ &nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc
-lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE></P>
<H2><A NAME="rescaling">7.2 Codificare in formato MPEG</A></H2>
@@ -195,7 +195,7 @@ supportati). Puoi codificare i seguenti codec :</P>
<CODE>vcodec</CODE>, come : <CODE>-lavcopts vcodec=msmpeg4</CODE></P>
<P>Un esempio, con la compressione MJPEG :<BR>
- <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -o title2.avi -ovc lavc
+ <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -o title2.avi -ovc lavc
-lavcopts vcodec=mjpeg -oac copy</CODE></P>
@@ -266,10 +266,10 @@ Quindi dovresti rimuoverli prima di ogni nuova esecuzione.</P>
<P><I>Copiare due sottotitoli da un DVD usando la codifica a tre passaggi</I><BR>
&nbsp;&nbsp;<CODE>rm sottotitoli.idx sottotitoli.sub</CODE><BR>
-&nbsp;&nbsp;<CODE>mencoder -dvd 1 -vobsubout sottotitoli -vobsuboutindex 0
+&nbsp;&nbsp;<CODE>mencoder dvd://1 -vobsubout sottotitoli -vobsuboutindex 0
-sid 2 -o frameno.avi -ovc frameno -oac mp3lame -lameopts vbr=3</CODE><BR>
- &nbsp;&nbsp;<CODE>mencoder -dvd 1 -oac copy -ovc divx4 -divx4opts pass=1</CODE><BR>
- &nbsp;&nbsp;<CODE>mencoder -dvd 1 -oac copy -ovc divx4 -divx4opts pass=2 -vobsubout
+ &nbsp;&nbsp;<CODE>mencoder dvd://1 -oac copy -ovc divx4 -divx4opts pass=1</CODE><BR>
+ &nbsp;&nbsp;<CODE>mencoder dvd://1 -oac copy -ovc divx4 -divx4opts pass=2 -vobsubout
subtitles -vobsuboutindex 1 -sid 5</CODE></P>
<P><I>Copiare un sottotitolo francese da un file MPEG</I><BR>
diff --git a/DOCS/pl/cd-dvd.html b/DOCS/pl/cd-dvd.html
index f365e65e45..8c5833fb44 100644
--- a/DOCS/pl/cd-dvd.html
+++ b/DOCS/pl/cd-dvd.html
@@ -196,9 +196,9 @@
<P>Po kompletn± listê dostêpnych opcji, prosimy o przeczytanie manuala.
Sk³adnia dla standardowego Video CD (VCD) jest nastêpuj±ca:</P>
-<P><CODE>mplayer -vcd &lt;¶cie¿ka&gt; [-cdrom-device &lt;uz±dzenie&gt;]</CODE></P>
+<P><CODE>mplayer vcd://&lt;¶cie¿ka&gt; [-cdrom-device &lt;uz±dzenie&gt;]</CODE></P>
-<P>Przyk³ad: <CODE>mplayer -vcd 2 -cdrom-device /dev/hdc</CODE></P>
+<P>Przyk³ad: <CODE>mplayer vcd://2 -cdrom-device /dev/hdc</CODE></P>
<P>Domy¶lnym u¿±dzeniem VCD jest <CODE>/dev/cdrom</CODE>. Je¿eli twoje ustawienia s± inne,
stwórz link symboliczny lub podaj poprawne urz±dzenie w lini komend opcj±
@@ -226,7 +226,7 @@
zawieraj±ce jeden pakiet danych MPEG PS na sektor zamiast systemu plików.
Podobnie do ¶cie¿ek audio CD, te ¶cie¿ki <B>nie mog± byæ zamontowane</B> (Montowa³e¶ kiedykolwiek
audio CD, by je odtworzyæ?). Poniewa¿ wiêkszo¶æ filmów jest w tej ¶ie¿ce,
- powiniene¶ najpierw spróbowaæ <CODE>-vcd 2</CODE>.</LI>
+ powiniene¶ najpierw spróbowaæ <CODE>vcd://2</CODE>.</LI>
<LI>Istniej± dyski VCD bez pierwszej ¶cie¿ki (pojedyñcza ¶cie¿ka i ca³kowity
brak systemu plików). Nadal mo¿na je odtworzyæ, ale nie mog± byæ zamontowane.</LI>
</UL>
diff --git a/DOCS/pl/documentation.html b/DOCS/pl/documentation.html
index 2a8f0cbe69..3e0985444d 100644
--- a/DOCS/pl/documentation.html
+++ b/DOCS/pl/documentation.html
@@ -1209,13 +1209,13 @@ dla filename1] filename2 [opcje dla filename2] ...</CODE></TD>
<TD></TD>
<TD> <FONT CLASS="text">VCD</TD>
<TD></TD>
-<TD><CODE> <FONT CLASS="text">mplayer [opcje] -vcd trackno
+<TD><CODE> <FONT CLASS="text">mplayer [opcje] vcd://trackno
/dev/cdrom</CODE></TD>
<TR>
<TD></TD>
<TD> <FONT CLASS="text">DVD</TD>
<TD></TD>
-<TD><CODE> <FONT CLASS="text">mplayer [opcje] -dvd titleno
+<TD><CODE> <FONT CLASS="text">mplayer [opcje] dvd://titleno
[-dvd-device /dev/dvd]</CODE></TD>
<TR>
<TD></TD>
@@ -1231,9 +1231,9 @@ tak, jak to robi Xine: <CODE>mplayer dvd://1</CODE> albo <CODE>mplayer
vcd://1</CODE></P>
<P><PRE> mplayer -vo x11 /mnt/Films/Contact/contact2.mpg
- mplayer -vcd 2
+ mplayer vcd://2
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></P>
<P><B><A NAME=3.2>3.2. Sterowanie</A></B></P>
diff --git a/DOCS/pl/encoding.html b/DOCS/pl/encoding.html
index 2ce227bf95..f602fcd824 100644
--- a/DOCS/pl/encoding.html
+++ b/DOCS/pl/encoding.html
@@ -37,9 +37,9 @@
dwie komendy s± potrzebne:<BR>
<CODE>&nbsp;&nbsp;&nbsp;&nbsp;rm frameno.avi</CODE> - usuñ plik, który mo¿e
pochodziæ z poprzedniego 3-krokowego kodowania (mo¿e kolidowaæ z obecnym)<BR>
- <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc -lavcopts
+ <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc -lavcopts
vcodec=mpeg4:vpass=1 -oac copy -o movie.avi<BR>
- &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc -lavcopts
+ &nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc -lavcopts
vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE></P>
<P><U><B>Kodowanie 3-krokowe:</B></U> to przed³u¿enie 2-krokowego kodowania,
@@ -75,11 +75,11 @@
<P><CODE>&nbsp;&nbsp;&nbsp;&nbsp;rm frameno.avi</CODE> - usuñ plik, który mo¿e
pochodziæ z poprzedniego 3-krokowego kodowania (mo¿e kolidowaæ z obecnym)<BR>
- <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc frameno
+ <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc frameno
-o frameno.avi -oac mp3lame -lameopts vbr=3<BR>
- &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc
+ &nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc
-lavcopts vcodec=mpeg4:vpass=1 -oac copy -o movie.avi<BR>
- &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc
+ &nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc
-lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE></P>
@@ -185,7 +185,7 @@ formatów wideo i audio (obecnie kodeki audio s± niedostêpne). Mo¿esz kodowaæ do
<CODE>vcodec</CODE>, czyli: <CODE>-lavcopts vcodec=msmpeg4</CODE></P>
<P>Przyk³ad z kompresj± MJPEG:<BR>
- <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -o title2.avi -ovc lavc
+ <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -o title2.avi -ovc lavc
-lavcopts vcodec=mjpeg -oac copy</CODE></P>
@@ -265,10 +265,10 @@ RAW RGB AVI.</P>
<P><I>Kopiowanie dwóch napisów z DVD podczas kodowania 3-krokowego</I><BR>
&nbsp;&nbsp;<CODE>rm subtitles.idx subtitles.sub</CODE><BR>
- &nbsp;&nbsp;<CODE>mencoder -dvd 1 -vobsubout subtitles -vobsuboutindex 0
+ &nbsp;&nbsp;<CODE>mencoder dvd://1 -vobsubout subtitles -vobsuboutindex 0
-sid 2 -o frameno.avi -ovc frameno -oac mp3lame -lameopts vbr=3</CODE><BR>
- &nbsp;&nbsp;<CODE>mencoder -dvd 1 -oac copy -ovc divx4 -divx4opts pass=1</CODE><BR>
- &nbsp;&nbsp;<CODE>mencoder -dvd 1 -oac copy -ovc divx4 -divx4opts pass=2 -vobsubout
+ &nbsp;&nbsp;<CODE>mencoder dvd://1 -oac copy -ovc divx4 -divx4opts pass=1</CODE><BR>
+ &nbsp;&nbsp;<CODE>mencoder dvd://1 -oac copy -ovc divx4 -divx4opts pass=2 -vobsubout
subtitles -vobsuboutindex 1 -sid 5</CODE></P>
<P><I>Kopiowanie francuskich napisów z pliku MPEG</I><BR>
diff --git a/DOCS/pl/mplayer.1 b/DOCS/pl/mplayer.1
index 2e81a863e0..892e0caede 100644
--- a/DOCS/pl/mplayer.1
+++ b/DOCS/pl/mplayer.1
@@ -523,7 +523,7 @@ Zrzuca strumieñ napisów ze strumienia VOB.
Zrzuca surowy skompresowany strumieñ video do ./\:stream.dump (nie bardzo
u¿yteczny).
.TP
-.B \-dvd <id\ tytu³u>
+.B \dvd://<id\ tytu³u>
Przeka¿ MPlayerowi które filmy (okre¶lone przez id tytu³u) ma odtwarzaæ.
Dla przyk³adu czasem '1' to trailery, a '2' to prawdziwy film.
@@ -830,7 +830,7 @@ wybierz jako¶æ kompresji jpeg
.B \-user <nazwa u¿ytkownika> (zobacz tak¿e opcjê \-passwd)
Wyszczególnienie nazwy u¿ytownika do autentyfikacji http.
.TP
-.B \-vcd <¶cie¿ka>
+.B \vcd://<¶cie¿ka>
Odtwarzaj ¶cie¿kê video CD z urz±dzenia lub obrazu pliku (zobacz \-cuefile).
.TP
.B \-vid <id>
@@ -3667,19 +3667,19 @@ Napisy s± szukane w katalogu filmu
.SH "PRZYK£ADY"
.TP
.B Szybki start odtwarzania DVD
-mplayer \-dvd 1
+mplayer \dvd://1
.TP
.B Odtwarzaj w japoñskim z angielskimi napisami
-mplayer \-dvd 1 \-alang ja \-slang en
+mplayer \dvd://1 \-alang ja \-slang en
.TP
.B Odtwarzaj tylko rozdzia³y 5, 6, 7
-mplayer \-dvd 1 \-chapter 5\-7
+mplayer \dvd://1 \-chapter 5\-7
.TP
.B Odtwarzanie DVD z ró¿nych ujêæ
-mplayer \-dvd 1 \-dvdangle 2
+mplayer \dvd://1 \-dvdangle 2
.TP
.B Odtwarzanie z innego urz±dzenia DVD
-mplayer \-dvd 1 \-dvd\-device /dev/\:dvd2
+mplayer \dvd://1 \-dvd\-device /dev/\:dvd2
.TP
.B Odtwarzanie starego stylu DVD (VOB)
mplayer \-dvdauth /dev/\:dvd /mnt/\:dvd/\:VIDEO_TS/\:VTS_02_4.VOB
@@ -3698,22 +3698,22 @@ mplayer \-tv on:driver=v4l:width=640:height=480:outfmt=i420 \-vc rawi420
\-vo xv
.TP
.B Kodowanie tytu³u #2 DVD, tylko wybranych rozdzia³ów
-mencoder \-dvd 2 \-chapter 10-15 \-o title2.avi \-oac copy \-ovc divx4
+mencoder \dvd://2 \-chapter 10-15 \-o title2.avi \-oac copy \-ovc divx4
.TP
.B Kodowanie tytu³u #2 DVD, zmieniaj±c rozmiar do 640x480
-mencoder \-dvd 2 \-vf scale=640:480 \-o title2.avi \-oac copy \-ovc divx4
+mencoder \dvd://2 \-vf scale=640:480 \-o title2.avi \-oac copy \-ovc divx4
.TP
.B Kodowanie tytu³u #2 DVD, zmieniaj±c rozmiar do 512xHHH (zachowaj stosunek
obrazu)
-mencoder \-dvd 2 \-vf scale \-zoom \-xy 512 \-o title2.avi \-oac copy
+mencoder \dvd://2 \-vf scale \-zoom \-xy 512 \-o title2.avi \-oac copy
\-ovc divx4
.TP
.B To samo, ale z rodzin± kodeków libavcodec, kompresja MPEG4 (Divx5)
-mencoder \-dvd 2 \-o title2.avi \-ovc lavc
+mencoder \dvd://2 \-o title2.avi \-ovc lavc
\-lavcopts vcodec=mpeg4:vhq:vbitrate=1800 \-oac copy
.TP
.B To samo, ale z rodzin± kodeków libavcodec, kompresja MJPEG
-mencoder \-dvd 2 \-o titel2.avi \-ovc lavc
+mencoder \dvd://2 \-o titel2.avi \-ovc lavc
\-lavcopts vcodec=mjpeg:vhq:vbitrate=1800 \-oac copy
.TP
.B Kodowanie wszystkich plików *.jpg w aktualnym katalog
diff --git a/DOCS/tech/encoding-tips.txt b/DOCS/tech/encoding-tips.txt
index 0f485fb977..5fb45c14ca 100644
--- a/DOCS/tech/encoding-tips.txt
+++ b/DOCS/tech/encoding-tips.txt
@@ -52,7 +52,7 @@ And now comes the question: how do I chose my encoding parameters
so that the results will be good? First let's take a look at a
typical mencoder line:
-mencoder -dvd 1 -o /dev/null -oac copy -ovc lavc \
+mencoder dvd://1 -o /dev/null -oac copy -ovc lavc \
-lavcopts vcodec=mpeg4:vbitrate=1000:vhq:vqmin=2:\
vlelim=-4:vcelim=9:lumi_mask=0.05:dark_mask=0.01:vpass=1 \
-vf crop=716:572:2:2,scale=640:480
@@ -440,7 +440,7 @@ viewed fullscreen.
4) I would recommend using the Ogg Vorbis audio codec with the .ogm
container format. Ogg Vorbis compress audio better than MP3. On a typical
old, mono-only audio stream, a 45 kbits/s Vorbis stream is ok. How to
-extract & compress an audio stream from a ripped DVD (mplayer -dvd 1
+extract & compress an audio stream from a ripped DVD (mplayer dvd:// 1
-dumpstream) :
rm -f audiodump.pcm ; mkfifo -m 600 audiodump.pcm
@@ -507,7 +507,7 @@ powerful enough or both. I'm extracting the vobsub subtitles and simply use
them with the .ogm
/ .avi :
-1) rip the DVD to harddisk with "mplayer -dvd 1 -dumpstream"
+1) rip the DVD to harddisk with "mplayer dvd://1 -dumpstream"
2) mount the DVD and copy the .ifo file
2) extract all vobsubs to one single file with something like :
diff --git a/DOCS/zh/cd-dvd.html b/DOCS/zh/cd-dvd.html
index 284bcce59d..3084b8c688 100644
--- a/DOCS/zh/cd-dvd.html
+++ b/DOCS/zh/cd-dvd.html
@@ -56,9 +56,9 @@ HREF="http://das.ist.org/~georg/">PlextorµÄSCSIÇý¶¯Æ÷</A>¡£</P>
<P>¿ÉÓÃÑ¡ÏîµÄÍêÕûÁбí²Î¼ûman page¡£²¥·Å±ê×¼µÄÊý×ֶ๦ÄܵúƬ(DVD)µÄÓï·¨ÈçÏ£º</P>
-<P><CODE>mplayer -dvd &lt;track&gt; [-dvd-device &lt;device&gt;]</CODE></P>
+<P><CODE>mplayer dvd://&lt;track&gt; [-dvd-device &lt;device&gt;]</CODE></P>
-<P>ʾÀý£º<CODE>mplayer -dvd 1 -dvd-device /dev/hdc</CODE></P>
+<P>ʾÀý£º<CODE>mplayer dvd://1 -dvd-device /dev/hdc</CODE></P>
<P>ĬÈϵÄDVDÉ豸ÊÇ<CODE>/dev/dvd</CODE>¡£Èç¹ûÄãµÄÉèÖò»Í¬£¬×÷Ò»¸ö·ûºÅÁ´½Ó£¬»òÕßÔÚÃüÁîÐÐÖÐÓÃ<CODE>-dvd-device</CODE>Ñ¡Ïî
Ö¸¶¨Ò»¸öÕýÈ·µÄÉ豸¡£</P>
@@ -144,9 +144,9 @@ DVDÇý¶¯Æ÷µÄµØÇø(ÔÚLinuxÏÂ)¡£<B>¾¯¸æ£º</B> ÄãÖ»ÓÐ5´ÎÉèÖõØÇøµÄ»ú»á¡£</P>
<P>²¥·Å±ê×¼µÄVideo CDs£º</P>
-<P><CODE>mplayer -vcd &lt;track&gt; [-cdrom-device &lt;device&gt;]</CODE></P>
+<P><CODE>mplayer vcd://&lt;track&gt; [-cdrom-device &lt;device&gt;]</CODE></P>
-<P>ʾÀý£º<CODE>mplayer -vcd 2 -cdrom-device /dev/hdc</CODE></P>
+<P>ʾÀý£º<CODE>mplayer vcd://2 -cdrom-device /dev/hdc</CODE></P>
<P>ĬÈϵÄVCDÉ豸ÊÇ<CODE>/dev/cdrom</CODE>¡£Èç¹ûÄãµÄÉèÖò»Í¬£¬×÷Ò»¸ö·ûºÅÁ´½Ó£¬»òÕßÔÚÃüÁîÐÐÖÐÓÃ<CODE>-cdrom-device</CODE>Ñ¡Ïî
Ö¸¶¨Ò»¸öÕýÈ·µÄÉ豸¡£</P>
@@ -167,7 +167,7 @@ MPlayer²¥·Å»ñµÃµÄÎļþ¡£</P>
(ͼÏñ£¬ÎÄ×ֵȵÈ)¡£</LI>
<LI>µÚ¶þºÍÖ®ºóµÄ¹ìµÀÊÇδ´¦ÀíµÄ2324×Ö½Ú/ÉÈÇøµÄMPEG(µçÓ°)¹ì£¬Ã¿¸öÉÈÇø°üº¬Ò»¸öMPEG PSÊý¾Ý°ü¶øûÓÐÎļþϵͳ¡£ÒôƵCDµÄ¹ìµÀÒ²ÀàËÆ¡£
ÕâЩ¹ìµÀÊÇ<B>ÎÞ·¨±»mountµÄ</B>(ÄãÔø¾­mountÒ»¸öÒôƵCDÈ»ºó²¥·Å¹ýÂð£¿)¡£´ó²¿·ÖµçÓ°¶¼ÔÚÕâ¸ö¹ìµÀ£¬ËùÒÔÄãÓ¦¸ÃÏÈÊÔÊÔ
-<CODE>-vcd 2</CODE>¡£</LI>
+<CODE>vcd://2</CODE>¡£</LI>
<LI>ÓÐЩVCDµúƬûÓеÚÒ»¸ö¹ìµÀ(µ¥¹ìµÀ¶ø¸ù±¾Ã»ÓÐÎļþϵͳ)¡£ËüÃÇÒ²¿ÉÒÔ²¥·Å£¬µ«ÊDz»ÄÜmount¡£</LI>
</UL>
diff --git a/DOCS/zh/documentation.html b/DOCS/zh/documentation.html
index 890f3ba5bc..f7a40fdaaa 100644
--- a/DOCS/zh/documentation.html
+++ b/DOCS/zh/documentation.html
@@ -990,8 +990,8 @@ konwert(Debian)»òÕßiconv(Red Hat)³ÌÐòÍê³É¡£<BR>
<TABLE BORDER=0>
<TR><TD>&nbsp;&nbsp;</TD><TD>µ¥Ò»Îļþ</TD><TD>&nbsp;&nbsp;</TD><TD><CODE>mplayer [options] [path/]filename</CODE></TD></TR>
<TR><TD></TD><TD>¶à¸öÎļþ</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(Ò²¿ÉÒÔʹÓÃplaylist)</CODE></TD></TR>
<TR><TD></TD><TD>RTSP</TD><TD></TD><TD><CODE>mplayer [options] rtsp://server.example.com/streamName</CODE></TD></TR>
</TABLE>
@@ -1001,9 +1001,9 @@ konwert(Debian)»òÕßiconv(Red Hat)³ÌÐòÍê³É¡£<BR>
<PRE>
mplayer -vo x11 /mnt/Films/Contact/contact2.mpg
- mplayer -vcd 2
+ mplayer vcd://2
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>
@@ -1422,7 +1422,7 @@ HREF="http://www.videolan.org/vlc/dx7headers.tgz">DirectX 7Í·Îļþ</A>£¬°ÑËüÃǽâÑ
<P>DVDͬÑù¿ÉÒÔ£¬ÓÃÏÂÃæµÄÃüÁîDVDÉ豸ÉèÖóÉÄãµÄCD-ROMÇý¶¯Æ÷£º</P>
-<P><CODE>mplayer -dvd &lt;title&gt; -dvd-device '\\.\d:'</CODE></P>
+<P><CODE>mplayer dvd://&lt;title&gt; -dvd-device '\\.\d:'</CODE></P>
<P>QuickTime DLL¾Ý˵ҲÄܹ¤×÷¡£ÓÃ<CODE>--enable-qtx-codecs</CODE>±àÒë²¢°Ñ±à½âÂëÆ÷·Åµ½Ä¬ÈϵÄWindows DLLλ
Öã¬<CODE>C:\WINNT\system32</CODE>»òÕß<CODE>C:\Windows\system</CODE>È¡¾öÓÚÄãµÄWindowsµÄ°æ±¾¡£</P>
diff --git a/DOCS/zh/encoding.html b/DOCS/zh/encoding.html
index 5b6c1c2a67..bef0228575 100644
--- a/DOCS/zh/encoding.html
+++ b/DOCS/zh/encoding.html
@@ -26,9 +26,9 @@ HREF="../tech/encoding-tips.txt">±àÂë¼¼ÇÉ</A>¡£ËÑË÷<A HREF="http://mplayerhq.hu/
<P>Õâ¸öÀý×ÓÑÝʾÈçºÎ°ÑDVD±àÂë³ÉΪ2-passµÄMPEG-4("DIVX")µÄAVI¡£Ö»ÐèÒªÁ½¸öÃüÁ<BR>
<CODE>&nbsp;&nbsp;&nbsp;&nbsp;rm frameno.avi</CODE> -- ɾµôÕâ¸öÎļþ£¬Ëü¿ÉÄÜÀ´×ÔÒÔÇ°µÄ3-pass±àÂë(Ëü»á¸ÉÈŵ±Ç°±àÂë)<BR>
- <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc -lavcopts
+ <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc -lavcopts
vcodec=mpeg4:vpass=1 -oac copy -o movie.avi<BR>
- &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc -lavcopts
+ &nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc -lavcopts
vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE></P>
<P><U><B>3-pass±àÂ룺</B></U>ÕâÊÇ2-pass±àÂëµÄÀ©Õ¹£¬¶ÔÒôƵµÄ±àÂëʹÓÃÒ»¸öµ¥¶ÀµÄ±àÂë¡£ÕâÖÖ·½·¨ÌṩÍƼöÊÓƵ±ÈÌØÂʵĹÀ¼ÆÒÔʹ֮Äܹ»ÊʺÏCDµÄÈÝÁ¿¡£Í¬Ê±£¬
@@ -54,11 +54,11 @@ MEncoderÔÚÕâ¸öpass½áÊøÖ®ºó£¬½«¶ÔÓÚ650Mb£¬700Mb£¬ºÍ800MbµÄÄ¿±ê´óС´òÓ¡ÍƼöµÄ±ÈÌØÂ
<H4>3-pass±àÂëµÄÀý×Ó£º</H4>
<P><CODE>&nbsp;&nbsp;&nbsp;&nbsp;rm frameno.avi</CODE> -- ÒÆÈ¥Õâ¸öÎļþ£¬Ëü¿ÉÄÜÀ´×ÔÒÔÇ°µÄ3-pass±àÂë(Ëü»á¸ÉÈŵ±Ç°±àÂë)<BR>
- <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc frameno
+ <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc frameno
-o frameno.avi -oac mp3lame -lameopts vbr=3<BR>
- &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc
+ &nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc
-lavcopts vcodec=mpeg4:vpass=1 -oac copy -o movie.avi<BR>
- &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc
+ &nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -ovc lavc
-lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE></P>
<H2><A NAME="mpeg">7.2 ±àÂëΪMPEG¸ñʽ</A></H2>
@@ -141,7 +141,7 @@ MEncoder½«Ê¹ÓÃ0£º¿ìËÙ¶þ´ÎÏßÐÔËõ·Å¡£</P>
<P>µÚÒ»À¸ÊÇÓ¦¸ÃÔÚ<CODE>vcodec</CODE>Ñ¡ÏîÀïÉèÖõıàÂë¸ñʽµÄÃû³Æ£¬±ÈÈ磺<CODE>-lavcopts vcodec=msmpeg4</CODE></P>
<P>ÀýÈ磬¶ÔÓÚʹÓÃMJPEGѹËõ£º<BR>
- <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -o title2.avi -ovc lavc
+ <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder dvd://2 -o title2.avi -ovc lavc
-lavcopts vcodec=mjpeg -oac copy</CODE></P>
@@ -204,10 +204,10 @@ MPNG(Motion PNG )»òMTGA(Motion TGA)Îļþ¡£</P>
<P><I>ÔÚ½øÐÐ3-pass±àÂëµÄͬʱ´ÓDVD¸´ÖÆÁ½·Ý×ÖÄ»</I><BR>
&nbsp;&nbsp;<CODE>rm subtitles.idx subtitles.sub</CODE><BR>
- &nbsp;&nbsp;<CODE>mencoder -dvd 1 -vobsubout subtitles -vobsuboutindex 0
+ &nbsp;&nbsp;<CODE>mencoder dvd://1 -vobsubout subtitles -vobsuboutindex 0
-sid 2 -o frameno.avi -ovc frameno</CODE><BR>
- &nbsp;&nbsp;<CODE>mencoder -dvd 1 -oac copy -ovc divx4 -pass 1</CODE><BR>
- &nbsp;&nbsp;<CODE>mencoder -dvd 1 -oac copy -ovc divx4 -pass 2 -vobsubout
+ &nbsp;&nbsp;<CODE>mencoder dvd://1 -oac copy -ovc divx4 -pass 1</CODE><BR>
+ &nbsp;&nbsp;<CODE>mencoder dvd://1 -oac copy -ovc divx4 -pass 2 -vobsubout
subtitles -vobsuboutindex 1 -sid 5</CODE></P>
<P><I>´ÓÒ»¸öMPEGÎļþÖи´ÖÆ·¨Óï×ÖÄ»</I><BR>
diff --git a/DOCS/zh/mplayer.1 b/DOCS/zh/mplayer.1
index 50f3aa9dbd..9c9785bee2 100644
--- a/DOCS/zh/mplayer.1
+++ b/DOCS/zh/mplayer.1
@@ -447,7 +447,7 @@ Full 5.1
.B \-dumpvideo (½öÓÃÓÚMPLAYER)
½«Ô­Ê¼µÄÊÓƵѹËõÁ÷¸´ÖƵ½./\:stream.dump(²»ÊÇÊ®·ÖºÃÓÃ).
.TP
-.B \-dvd <½ÚÄ¿±êʶ>
+.B \dvd://<½ÚÄ¿±êʶ>
¸æËßMPlayer²¥·ÅÄĸöµçÓ°(ͨ¹ý½ÚÄ¿±êʶָ¶¨). ±ÈÈçÓÐʱ'1'ÊÇÒ»²¿Ô¤¸æƬ,
¶ø'2'²ÅÊÇÕæÕýµÄµçÓ°.
@@ -726,7 +726,7 @@ tv_set_channelºÍtv_last_channelµÈÃüÁ¿ÉÒÔ±»Ò£¿ØÆ÷(²Î¼ûlirc)ʹÓÃ.
.B \-user <Óû§Ãû> (²Î¼û\-passwdÑ¡Ïî)
É趨httpÈÏÖ¤µÄÓû§Ãû.
.TP
-.B \-vcd <Òô¹ì>
+.B \vcd://<Òô¹ì>
´ÓÉ豸»ò¾µÏñÎļþÖв¥·Åvideo CDÒô¹ì(²Î¼û\-cuefile).
.TP
.B \-vid <±êʶ>
@@ -3424,19 +3424,19 @@ GUI²¥·ÅÁбí
.SH ʾÀý
.TP
.B ¿ìËÙDVD²¥·Å
-mplayer \-dvd 1
+mplayer \dvd://1
.TP
.B ²¥·ÅÈÕÎĶԻ°ºÍÓ¢ÎÄ×ÖÄ»
-mplayer \-dvd 1 \-alang ja \-slang en
+mplayer \dvd://1 \-alang ja \-slang en
.TP
.B Ö»²¥·Å5, 6, 7³¡¾°
-mplayer \-dvd 1 \-chapter 5\-7
+mplayer \dvd://1 \-chapter 5\-7
.TP
.B ¶àÊÓ½ÇDVD²¥·Å
-mplayer \-dvd 1 \-dvdangle 2
+mplayer \dvd://1 \-dvdangle 2
.TP
.B ´ÓÆäËüDVDÉ豸²¥·Å
-mplayer \-dvd 1 \-dvd\-device /dev/\:dvd2
+mplayer \dvd://1 \-dvd\-device /dev/\:dvd2
.TP
.B ÀÏʦDVD(VOB)²¥·Å
mplayer \-dvdauth /dev/\:dvd /mnt/\:dvd/\:VIDEO_TS/\:VTS_02_4.VOB
@@ -3455,21 +3455,21 @@ mplayer \-tv on:driver=v4l:width=640:height=480:outfmt=i420 \-vc rawi420
\-vo xv
.TP
.B ±àÂëDVD½ÚÄ¿#2ÖÐÑ¡ÔñµÄ³¡¾°
-mencoder \-dvd 2 \-chapter 10-15 \-o title2.avi \-oac copy \-ovc divx4
+mencoder \dvd://2 \-chapter 10-15 \-o title2.avi \-oac copy \-ovc divx4
.TP
.B ±àÂëDVD½ÚÄ¿#2, Ëõ·Åµ½640x480
-mencoder \-dvd 2 \-vf scale=640:480 \-o title2.avi \-oac copy \-ovc divx4
+mencoder \dvd://2 \-vf scale=640:480 \-o title2.avi \-oac copy \-ovc divx4
.TP
.B ±àÂëDVD½ÚÄ¿#2, Ëõ·Åµ½512xHHH(±£³Ö³¤¿í±È)
-mencoder \-dvd 2 \-vf scale \-zoom \-xy 512 \-o title2.avi \-oac copy
+mencoder \dvd://2 \-vf scale \-zoom \-xy 512 \-o title2.avi \-oac copy
\-ovc divx4
.TP
.B ͬÉÏ, µ«Ê¹ÓÃlibavcodec×å, MPEG4(Divx5)ѹËõ
-mencoder \-dvd 2 \-o title2.avi \-ovc lavc
+mencoder \dvd://2 \-o title2.avi \-ovc lavc
\-lavcopts vcodec=mpeg4:vhq:vbitrate=1800 \-oac copy
.TP
.B ͬÉÏ, µ«Ê¹ÓÃlibavcodec×å, MJPEGѹËõ
-mencoder \-dvd 2 \-o titel2.avi \-ovc lavc
+mencoder \dvd://2 \-o titel2.avi \-ovc lavc
\-lavcopts vcodec=mjpeg:vhq:vbitrate=1800 \-oac copy
.TP
.B ±àÂ뵱ǰĿ¼ÏµÄËùÓÐ*.jpgÎļþ
diff --git a/README b/README
index e05e56d199..5407f4cdbe 100644
--- a/README
+++ b/README
@@ -208,8 +208,8 @@ filepicker.
To play a VCD track or a DVD title, try:
- mplayer -vcd 2 -cdrom-device /dev/hdc
- mplayer -dvd 1 -alang en -slang hu -dvd-device /dev/hdd
+ mplayer vcd://2/dev/hdc
+ mplayer dvd://1 -alang en -slang hu -dvd-device /dev/hdd
See 'mplayer -help' and 'man mplayer' for further options.
diff --git a/TOOLS/dvd2divxscript.pl b/TOOLS/dvd2divxscript.pl
index 5d5738530f..2acbfa049e 100755
--- a/TOOLS/dvd2divxscript.pl
+++ b/TOOLS/dvd2divxscript.pl
@@ -201,7 +201,7 @@ if ($writecd) {
# here comes the fun part...
print "precacheing...\n";
-$status = system ("mencoder -dvd $dvd_track -ovc copy -oac copy -alang $lang -o $vob_tempfile 1>/dev/tty8 2>/dev/tty8");
+$status = system ("mencoder dvd://$dvd_track -ovc copy -oac copy -alang $lang -o $vob_tempfile 1>/dev/tty8 2>/dev/tty8");
die "Prechacheing failed. mencoder exited with Status Code $?" unless $status == 0;
print "Encoding Audio...\n";
diff --git a/TOOLS/mencvcd b/TOOLS/mencvcd
index 3a8c6e0b10..7be9d73aeb 100755
--- a/TOOLS/mencvcd
+++ b/TOOLS/mencvcd
@@ -153,10 +153,10 @@ function usage() {
echo "'$HOWCALLED teneriffa teneriffa.avi'"
echo "this creates a VCD from an avi file."
echo
- echo "'$HOWCALLED crazy -dvd 3 -w':"
+ echo "'$HOWCALLED crazy dvd://3 -w':"
echo "encodes and burns dvd title 3 to VCD in 16:9."
echo
- echo "'$HOWCALLED carter -dvd 1 -sid 0 -aid 128 -ss 3:00 -frames 1500 \\"
+ echo "'$HOWCALLED carter dvd://1 -sid 0 -aid 128 -ss 3:00 -frames 1500 \\"
echo " -noburn -vnorm n -vfr 1':"
echo "this encodes 1500 frames of dvd title 1 with subtitle 0 and audio stream"
echo "128 starting from 3:00 with frame rate 29.97 fps and input video norm NTSC"
diff --git a/help/help_mp-bg.h b/help/help_mp-bg.h
index 684f110445..c44c1c9d7e 100644
--- a/help/help_mp-bg.h
+++ b/help/help_mp-bg.h
@@ -20,13 +20,13 @@ static char help_text[]=
" -vo <drv[:dev]> Èçáèðà âèäåî èçõîä (äðàéâåð è óñòðîéñòâî) (âèæ '-vo help')\n"
" -ao <drv[:dev]> Èçáèðà àóäèî èçõîä (äðàéâåð è óñòðîéñòâî) (âèæ '-ao help')\n"
#ifdef HAVE_VCD
-" -vcd <trackno> Ïóñêà VCD (Âèäåî Êîïàêò Äèñê) ïèñòà, âìåñòî ôàéë\n"
+" vcd://<trackno> Ïóñêà VCD (Âèäåî Êîïàêò Äèñê) ïèñòà, âìåñòî ôàéë\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <dev> Óêàçâà DVD óñòðîéñòâî çà äåøèôðèðàíå (ïðè êîäèðàíè äèñêîâå)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titleno> Ïóñêà DVD çàãëàâèå/ïúòå÷êà îò óñòðîéñòâîòî, âìåñòî îò ôàéë\n"
+" dvd://<titleno> Ïóñêà DVD çàãëàâèå/ïúòå÷êà îò óñòðîéñòâîòî, âìåñòî îò ôàéë\n"
" -alang/-slang Èçáèðà åçèê íà DVD - àóäèî/ñóáòèòðè (ñ 2-áóêâåí êîä - 'bg')\n"
#endif
" -ss <timepos> Ïðåâúðòà äî äàäåíà ïîçèöèÿ (â ñåêóíäè èëè ÷÷:ìì:ññ)\n"
diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h
index bcf19178e3..c56876ab92 100644
--- a/help/help_mp-cs.h
+++ b/help/help_mp-cs.h
@@ -15,13 +15,13 @@ static char help_text[]=
" -vo <ovl[:zaø]> výbìr výst. video ovladaèe a zaøízení (-vo help pro seznam)\n"
" -ao <ovl[:zaø]> výbìr výst. audio ovladaèe a zaøízení (-ao help pro seznam)\n"
#ifdef HAVE_VCD
-" -vcd <èíslo> pøehrát VCD (Video CD) stopu ze zaøízení místo ze souboru\n"
+" vcd://<èíslo> pøehrát VCD (Video CD) stopu ze zaøízení místo ze souboru\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <zaø> urèení DVD zaøízení pro autentizaci (pro kódované disky)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <èíslo> pøehrát DVD titul ze zaøízení (mechaniky), místo ze souboru\n"
+" dvd://<èíslo> pøehrát DVD titul ze zaøízení (mechaniky), místo ze souboru\n"
" -alang/-slang zvolit jazyk audia/titulkù na DVD (dvouznakový kód zemì)\n"
#endif
" -ss <timepos> posun na danou pozici (sekundy nebo hh:mm:ss)\n"
diff --git a/help/help_mp-de.h b/help/help_mp-de.h
index 8eae1cd798..fa59e5ce81 100644
--- a/help/help_mp-de.h
+++ b/help/help_mp-de.h
@@ -17,13 +17,13 @@ static char help_text[]=
" -vo <drv[:dev]> Videoausgabetreiber & -gerät (siehe '-vo help' für eine Liste)\n"
" -ao <drv[:dev]> Audioausgabetreiber & -gerät (siehe '-ao help' für eine Liste)\n"
#ifdef HAVE_VCD
-" -vcd <tracknr> Spiele einen VCD-Titel (Video CD) anstelle einer Datei\n"
+" vcd://<tracknr> Spiele einen VCD-Titel (Video CD) anstelle einer Datei\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <dev> Benutze DVD-Gerät für die Authentifizierung (für verschl. DVDs)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titelnr> Spiele DVD-Titel von Gerät anstelle einer Datei\n"
+" dvd://<titelnr> Spiele DVD-Titel von Gerät anstelle einer Datei\n"
" -alang/-slang Wähle DVD Audio/Untertitel Sprache (2-Zeichen-Ländercode)\n"
#endif
" -ss <zeitpos> Starte Abspielen ab Position (Sekunden oder hh:mm:ss)\n"
diff --git a/help/help_mp-dk.h b/help/help_mp-dk.h
index 3dac8512eb..51f1eab5ab 100644
--- a/help/help_mp-dk.h
+++ b/help/help_mp-dk.h
@@ -17,13 +17,13 @@ static char help_text[]=
" -vo <drv[:enhed]> vælg videodriver og -enhed (se '-vo help' for en komplet liste)\n"
" -ao <drv[:enhed]> vælg lyddriver og -enhed (se '-ao help' for en komplet liste)\n"
#ifdef HAVE_VCD
-" -vcd <trackno> afspil et VCD (Video CD) spor fra et drev i stedet for en fil\n"
+" vcd://<trackno> afspil et VCD (Video CD) spor fra et drev i stedet for en fil\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <dev> specificer DVD enhed til godkendelse (krypterede diske)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titleno> afspiller DVD titel fra et drev i stedet for en fil\n"
+" dvd://<titleno> afspiller DVD titel fra et drev i stedet for en fil\n"
" -alang/-slang vælg DVD lyd / undertekst sprog (vha. landekode på 2 tegn)\n"
#endif
" -ss <timepos> søger til en given position (sekund eller hh:mm:ss)\n"
diff --git a/help/help_mp-el.h b/help/help_mp-el.h
index 111b8c8c0e..529a8fab3c 100644
--- a/help/help_mp-el.h
+++ b/help/help_mp-el.h
@@ -19,13 +19,13 @@ static char help_text[]=
" -vo <drv[:dev]> åðéëÝîôå ôïí ïäçãü åîüäïõ âßíôåï êáé ôç óõóêåõÞ (âëÝðå '-vo help' ãéá ôç ëßóôá)\n"
" -ao <drv[:dev]> åðéëÝîôå ôïí ïäçãü åîüäïõ Þ÷ïõ êáé ôç óõóêåõÞ (âëÝðå '-ao help' ãéá ôç ëßóôá)\n"
#ifdef HAVE_VCD
-" -vcd <áñéèìüò track> áíáðáñáãùãÞ track VCD (video cd) áðü óõóêåõÞ áíôß ãéá áñ÷åßï\n"
+" vcd://<áñéèìüò track> áíáðáñáãùãÞ track VCD (video cd) áðü óõóêåõÞ áíôß ãéá áñ÷åßï\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <dev> ïñßæåé ôç óõóêåõÞ DVD ãéá ðéóôïðïßçóç (ãéá êñõðôïãñáöçìÝíïõò äßóêïõò)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titleno> áíáðáñáãùãÞ ôïõ ôßôëïõ/track DVD áðü ôç óõóêåõÞ áíôß ãéá áñ÷åßï\n"
+" dvd://<titleno> áíáðáñáãùãÞ ôïõ ôßôëïõ/track DVD áðü ôç óõóêåõÞ áíôß ãéá áñ÷åßï\n"
" -alang/-slang åðéëïãÞ ôçò ãëþóóáò ôïõ Þ÷ïõ/õðïôßôëùí ôïõ DVD (2 ÷áñáêôÞñåò ôïõ êùäéêïý ôçò ÷þñáò)\n"
#endif
" -ss <timepos> áíáæÞôçóç óå äåäïìÝíç èÝóç (äåõôåñüëåðôá Þ ùù:ëë:ää)\n"
diff --git a/help/help_mp-en.h b/help/help_mp-en.h
index 54fe71fd26..bb64c80315 100644
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@@ -21,13 +21,13 @@ static char help_text[]=
" -vo <drv[:dev]> select video output driver & device ('-vo help' for a list)\n"
" -ao <drv[:dev]> select audio output driver & device ('-ao help' for a list)\n"
#ifdef HAVE_VCD
-" -vcd <trackno> play VCD (Video CD) track from device instead of plain file\n"
+" vcd://<trackno> play VCD (Video CD) track from device instead of plain file\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <dev> specify DVD device for authentication (for encrypted discs)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titleno> play DVD title from device instead of plain file\n"
+" dvd://<titleno> play DVD title from device instead of plain file\n"
" -alang/-slang select DVD audio/subtitle language (by 2-char country code)\n"
#endif
" -ss <timepos> seek to given (seconds or hh:mm:ss) position\n"
diff --git a/help/help_mp-es.h b/help/help_mp-es.h
index 85dfb8c9dc..71009b4a39 100644
--- a/help/help_mp-es.h
+++ b/help/help_mp-es.h
@@ -26,12 +26,12 @@ static char help_text[]=
"Opciones básicas: ('man mplayer' para una lista completa)\n"
" -vo <driver[:disp]> Seleccionar driver de salida de vídeo y dispositivo ('-vo help' para obtener una lista).\n"
" -ao <driver[:disp]> Seleccionar driver de salida de audio y dispositivo ('-ao help' para obtener una lista).\n"
-" -vcd <numpista> Reproducir pista de VCD (Video CD) desde un dispositivo en vez de un archivo regular.\n"
+" vcd://<numpista> Reproducir pista de VCD (Video CD) desde un dispositivo en vez de un archivo regular.\n"
#ifdef HAVE_LIBCSS
" -dvdauth <disp> Especificar dispositivo DVD para autenticación (para discos encriptados).\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <número> Reproducir título o pista de DVD desde un dispositivo en vez de un archivo regular.\n"
+" dvd://<número> Reproducir título o pista de DVD desde un dispositivo en vez de un archivo regular.\n"
" -alang <lengua> Seleccionar lengua para el audio del DVD (con código de país de dos caracteres. p. ej. 'es').\n"
" -alang <lengua> Seleccionar lengua para los subtítulos del DVD.\n"
#endif
diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h
index 04a6ad4efb..58ca53d13a 100644
--- a/help/help_mp-fr.h
+++ b/help/help_mp-fr.h
@@ -17,13 +17,13 @@ static char help_text[]=
" -vo <pil[:pér]> sélectionne le pilote et le périph. vidéo ('-vo help' pour la liste)\n"
" -ao <pil[:pér]> sélectionne le pilote et le périph. audio ('-ao help' pour la liste)\n"
#ifdef HAVE_VCD
-" -vcd <n°piste> lit une piste VCD (Video CD) plutôt qu'un fichier\n"
+" vcd://<n°piste> lit une piste VCD (Video CD) plutôt qu'un fichier\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <pér> précise le chemin du lecteur DVD (pour les DVD cryptés)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <n°titre> joue un titre DVD plutôt qu'un fichier\n"
+" dvd://<n°titre> joue un titre DVD plutôt qu'un fichier\n"
" -alang/-slang sélectionne la langue audio/sous-titres (code pays à 2 lettres)\n"
#endif
" -ss <temps> démarre la lecture à 'temps' (temps en secondes ou hh:mm:ss)\n"
diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h
index 2a0585abc5..b601a45d92 100644
--- a/help/help_mp-hu.h
+++ b/help/help_mp-hu.h
@@ -18,13 +18,13 @@ static char help_text[]=
" -vo <drv[:dev]> videomeghajtó és -alegység kiválasztása (lista: '-vo help')\n"
" -ao <drv[:dev]> audiomeghajtó és -alegység kiválasztása (lista: '-ao help')\n"
#ifdef HAVE_VCD
-" -vcd <sávszám> lejátszás VCD (video cd)-sávból, közvetlenül az eszközrõl\n"
+" vcd://<sávszám> lejátszás VCD (video cd)-sávból, közvetlenül az eszközrõl\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <megh> DVD-meghajtó elérési útjának megadása (kódolt lemezekhez)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titleno> a megadott DVD sáv lejátszása, file helyett\n"
+" dvd://<titleno> a megadott DVD sáv lejátszása, file helyett\n"
" -alang/-slang DVD audio/felirat nyelv kiválasztása (2 betûs országkóddal)\n"
#endif
" -ss <idõpoz> a megadott (másodperc v. óra:perc:mperc) pozícióra tekerés\n"
diff --git a/help/help_mp-it.h b/help/help_mp-it.h
index 4592b4d14c..a796e7932d 100644
--- a/help/help_mp-it.h
+++ b/help/help_mp-it.h
@@ -23,13 +23,13 @@ static char help_text[]=
" -vo <drv[:dev]> sceglie driver e dispositivo output video ('-vo help' lista)\n"
" -ao <drv[:dev]> sceglie driver e dispositivo output audio ('-ao help' lista)\n"
#ifdef HAVE_VCD
-" -vcd <trackno> legge traccia VCD (Video CD) da dispositivo anziché da file\n"
+" vcd://<trackno> legge traccia VCD (Video CD) da dispositivo anziché da file\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <dev> dispositivo DVD per l\'autenticazione (per dischi criptati)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titleno> legge titolo/traccia DVD dal dispositivo anziché da file\n"
+" dvd://<titleno> legge titolo/traccia DVD dal dispositivo anziché da file\n"
" -alang/-slang sceglie lingua audio/sottotitoli DVD (cod nazione 2 caratteri)\n"
#endif
" -ss <timepos> cerca una determinata posizione (in secondi o in hh:mm:ss) \n"
diff --git a/help/help_mp-ko.h b/help/help_mp-ko.h
index da68e4a8bb..f5d5891d5c 100644
--- a/help/help_mp-ko.h
+++ b/help/help_mp-ko.h
@@ -17,12 +17,12 @@ static char help_text[]=
"¼±ÅûçÇ×µé:\n"
" -vo <drv[:dev]> ºñµð¿À Ãâ·Â µå¶óÀ̹ö ¹× ÀåÄ¡ ¼±Åà (¸ñ·Ïº¸±â´Â '-vo help')\n"
" -ao <drv[:dev]> ¿Àµð¿À Ãâ·Â µå¶óÀ̹ö ¹× ÀåÄ¡ ¼±Åà (¸ñ·Ïº¸±â´Â '-ao help')\n"
-" -vcd <trackno> ÆÄÀÏÀÌ ¾Æ´Ñ ÀåÄ¡·ÎºÎÅÍ VCD (ºñµð¿À cd) Æ®·¢ Àç»ý\n"
+" vcd://<trackno> ÆÄÀÏÀÌ ¾Æ´Ñ ÀåÄ¡·ÎºÎÅÍ VCD (ºñµð¿À cd) Æ®·¢ Àç»ý\n"
#ifdef HAVE_LIBCSS
" -dvdauth <dev> ÀÎÁõÀ» À§ÇØ DVD ÀåÄ¡ ÁöÁ¤ (¾ÏȣȭµÈ µð½ºÅ©¿ë)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titleno> ÆÄÀÏÀÌ ¾Æ´Ñ ÀåÄ¡·ÎºÎÅÍ DVD ŸÀÌƲ/Æ®·¢ Àç»ý\n"
+" dvd://<titleno> ÆÄÀÏÀÌ ¾Æ´Ñ ÀåÄ¡·ÎºÎÅÍ DVD ŸÀÌƲ/Æ®·¢ Àç»ý\n"
#endif
" -ss <timepos> ƯÁ¤ À§Ä¡·Î ã¾Æ°¡±â (ÃÊ ¶Ç´Â ½Ã:ºÐ:ÃÊ)\n"
" -nosound ¼Ò¸® Àç»ý ¾ÈÇÔ\n"
diff --git a/help/help_mp-nl.h b/help/help_mp-nl.h
index 46ca781829..f7358a246f 100644
--- a/help/help_mp-nl.h
+++ b/help/help_mp-nl.h
@@ -13,13 +13,13 @@ static char help_text[]=
" -vo <drv[:dev]> selecteer video uitvoer driver & device (zie '-vo help' voor lijst)\n"
" -ao <drv[:dev]> selecteer audio uitvoer driver & device (zie '-ao help' voor lijst)\n"
#ifdef HAVE_VCD
-" -vcd <trackno> speel VCD (Video CD) track van device in plaats van standaard bestand\n"
+" vcd://<trackno> speel VCD (Video CD) track van device in plaats van standaard bestand\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <dev> specificeer DVD device voor authenticatie (voor geencrypteerde schijven)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titelnr> speel DVD titel/track van device in plaats van gewoon bestand\n"
+" dvd://<titelnr> speel DVD titel/track van device in plaats van gewoon bestand\n"
" -alang/-slang selecteer DVD audio/ondertitelingstaal (door middel van 2-karakter landcode)\n"
#endif
" -ss <timepos> ga naar opgegeven (seconden of hh:mm:ss) positie\n"
diff --git a/help/help_mp-no.h b/help/help_mp-no.h
index 7e2a516f56..2615941b46 100644
--- a/help/help_mp-no.h
+++ b/help/help_mp-no.h
@@ -15,12 +15,12 @@ static char help_text[]=
"Valg:\n"
" -vo <drv[:dev]> velg video-ut driver og enhet (se '-vo help' for liste)\n"
" -ao <drv[:dev]> velg lyd-ut driver og enhet (se '-ao help' for liste)\n"
-" -vcd <sporno> spill VCD (video cd) spor fra enhet i stedet for fil\n"
+" vcd://<sporno> spill VCD (video cd) spor fra enhet i stedet for fil\n"
#ifdef HAVE_LIBCSS
" -dvdauth <dev> spesifiser DVD enhet for autentikasjon (for krypterte disker)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <tittelno> spill DVD tittel/spor fra enhet i stedet for fil\n"
+" dvd://<tittelno> spill DVD tittel/spor fra enhet i stedet for fil\n"
#endif
" -ss <timepos> søk til gitt (sekunder eller hh:mm:ss) posisjon\n"
" -nosound ikke spill av lyd\n"
diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h
index d02161bd89..746f804ad3 100644
--- a/help/help_mp-pl.h
+++ b/help/help_mp-pl.h
@@ -19,13 +19,13 @@ static char help_text[]=
" -vo <drv[:dev]> wybór sterownika[:urz±dzenia] video (lista po '-vo help')\n"
" -ao <drv[:dev]> wybór sterownika[:urz±dzenia] audio (lista po '-ao help')\n"
#ifdef HAVE_VCD
-" -vcd <trackno> odtwarzanie bezpo¶rednio ¶cie¿ki VCD (video cd)\n"
+" vcd://<trackno> odtwarzanie bezpo¶rednio ¶cie¿ki VCD (video cd)\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <dev> urz±dzenie DVD do autoryzacji (dla zaszyfrowanych dysków)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titleno> odtwarzanie bezpo¶rednio tytu³u DVD\n"
+" dvd://<titleno> odtwarzanie bezpo¶rednio tytu³u DVD\n"
" -alang/-slang jêzyk dla d¼wiêku/napisów (poprzez 2-znakowy kod kraju)\n"
#endif
" -ss <timepos> skok do podanej pozycji (sekundy albo hh:mm:ss)\n"
diff --git a/help/help_mp-pt_BR.h b/help/help_mp-pt_BR.h
index 22f0f39dbc..74ea094402 100644
--- a/help/help_mp-pt_BR.h
+++ b/help/help_mp-pt_BR.h
@@ -20,7 +20,7 @@ static char help_text[]=
" -ao <drv[:dev]> seleciona o driver de saída de audio & dispositivo\n"
" ('-vo help' para listar)\n"
#ifdef HAVE_VCD
-" -vcd <numtrilha> reproduz trilha de VCD (Video CD) do dispositivo em vez de um\n"
+" vcd://<numtrilha> reproduz trilha de VCD (Video CD) do dispositivo em vez de um\n"
" arquivo\n"
#endif
#ifdef HAVE_LIBCSS
@@ -28,7 +28,7 @@ static char help_text[]=
" encriptados)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <numtítilo> reproduz título de DVD do dispositivo em vez de um arquivo\n"
+" dvd://<numtítilo> reproduz título de DVD do dispositivo em vez de um arquivo\n"
" -alang/-slang seleciona o idioma/legenda do DVD (pelo código país de duas\n"
" letras)\n"
#endif
diff --git a/help/help_mp-ro.h b/help/help_mp-ro.h
index 9467f76309..0426c39ce7 100644
--- a/help/help_mp-ro.h
+++ b/help/help_mp-ro.h
@@ -14,12 +14,12 @@ static char help_text[]=
"Opþiuni:\n"
" -vo <drv[:disp]> Ieºirea video: driver&dispozitiv ('-vo help' pentru o listã)\n"
" -ao <drv[:disp]> Ieºirea audio: driver&dispozitiv ('-ao help' pentru o listã)\n"
-" -vcd <numãr pistã> foloseºte <pista> de pe dispozitivul VCD în loc de fiºier\n"
+" vcd://<numãr pistã> foloseºte <pista> de pe dispozitivul VCD în loc de fiºier\n"
#ifdef HAVE_LIBCSS
" -dvdauth <disp> dispozitivul DVD pentru autentificare (la discuri encriptate)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titlu> foloseºte titlu/pista de pe dispozitivul DVD în loc de fiºier\n"
+" dvd://<titlu> foloseºte titlu/pista de pe dispozitivul DVD în loc de fiºier\n"
#endif
" -ss <poziþia> sare la poziþia (secunde sau oo:mm:ss)\n"
" -nosound fãrã sunet\n"
diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h
index a4c78c90d5..384ec9d5d0 100644
--- a/help/help_mp-ru.h
+++ b/help/help_mp-ru.h
@@ -16,13 +16,13 @@ static char help_text[]=
" -vo <drv[:dev]> ×ÙÂÏÒ ÄÒÁÊ×ÅÒÁ É ÕÓÔÒÏÊÓÔ×Á ×ÉÄÅÏ ×Ù×ÏÄÁ (ÓÐÉÓÏË ÓÍ. Ó '-vo help')\n"
" -ao <drv[:dev]> ×ÙÂÏÒ ÄÒÁÊ×ÅÒÁ É ÕÓÔÒÏÊÓÔ×Á ÁÕÄÉÏ ×Ù×ÏÄÁ (ÓÐÉÓÏË ÓÍ. Ó '-ao help')\n"
#ifdef HAVE_VCD
-" -vcd <ÎÏÍÅÒ ÔÒÅËÁ> ÉÇÒÁÔØ ÄÏÒÏÖËÕ VCD (video cd) Ó ÕÓÔÒÏÊÓÔ×Á ×ÍÅÓÔÏ ÆÁÊÌÁ\n"
+" vcd://<ÎÏÍÅÒ ÔÒÅËÁ> ÉÇÒÁÔØ ÄÏÒÏÖËÕ VCD (video cd) Ó ÕÓÔÒÏÊÓÔ×Á ×ÍÅÓÔÏ ÆÁÊÌÁ\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <dev> ×ÙÂÏÒ ÕÓÔÒÏÊÓÔ×Á DVD ÄÌÑ Á×ÔÏÒÉÚÁÃÉÉ (ÄÌÑ ÛÉÆÒÏ×ÁÎÎÙÈ ÄÉÓËÏ×)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <ÎÏÍÅÒ ÒÏÌÉËÁ> ÉÇÒÁÔØ DVD ÒÏÌÉË Ó ÕÓÔÒÏÊÓÔ×Á ×ÍÅÓÔÏ ÆÁÊÌÁ\n"
+" dvd://<ÎÏÍÅÒ ÒÏÌÉËÁ> ÉÇÒÁÔØ DVD ÒÏÌÉË Ó ÕÓÔÒÏÊÓÔ×Á ×ÍÅÓÔÏ ÆÁÊÌÁ\n"
" -alang/-slang ×ÙÂÒÁÔØ ÑÚÙË ÁÕÄÉÏ/ÓÕÂÔÉÔÒÏ× DVD (Ä×ÕÂÕË×ÅÎÎÙÊ ËÏÄ ÓÔÒÁÎÙ)\n"
#endif
" -ss <×ÒÅÍÑ> ÐÅÒÅÍÅÓÔÉÔØÓÑ ÎÁ ÚÁÄÁÎÎÕÀ (ÓÅËÕÎÄÙ ÉÌÉ þþ:íí:óó) ÐÏÚÉÃÉÀ\n"
diff --git a/help/help_mp-sk.h b/help/help_mp-sk.h
index 1cfa204ed6..ee00dcb73e 100644
--- a/help/help_mp-sk.h
+++ b/help/help_mp-sk.h
@@ -19,13 +19,13 @@ static char help_text[]=
" -vo <drv[:dev]> výber výstup. video ovládaèa&zariadenia (-vo help pre zoznam)\n"
" -ao <drv[:dev]> výber výstup. audio ovládaèa&zariadenia (-ao help pre zoznam)\n"
#ifdef HAVE_VCD
-" -vcd <trackno> prehra» VCD (video cd) stopu zo zariadenia namiesto zo súboru\n"
+" vcd://<trackno> prehra» VCD (video cd) stopu zo zariadenia namiesto zo súboru\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <dev> urèenie DVD zariadenia pre overenie autenticity (pre kódované disky)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titleno> prehra» DVD titul/stopu zo zariadenia (mechaniky) namiesto súboru\n"
+" dvd://<titleno> prehra» DVD titul/stopu zo zariadenia (mechaniky) namiesto súboru\n"
" -alang/-slang vybra» jazyk DVD zvuku/titulkov(pomocou 2-miest. kódu krajiny)\n"
#endif
" -ss <timepos> posun na pozíciu (sekundy alebo hh:mm:ss)\n"
diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h
index 982fc42409..378123f223 100644
--- a/help/help_mp-tr.h
+++ b/help/help_mp-tr.h
@@ -17,13 +17,13 @@ static char help_text[]=
" -vo <drv[:aygýt]> video çýkýþ sürücüsünü & aygýtýný seçin ('-vo help' ile listeyi görebilirsiniz)\n"
" -ao <drv[:aygýt]> ses çýkýþ sürücüsünü & aygýtýný seçin ('-ao help' ile listeyi görebilirsiniz)\n"
#ifdef HAVE_VCD
-" -vcd <trackno> vcd yi Çalmaya baþlar. (Video CD) VCD track numarasýný girebilirsiniz\n"
+" vcd://<trackno> vcd yi Çalmaya baþlar. (Video CD) VCD track numarasýný girebilirsiniz\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <aygit> Doðrulamak için bir DVD aygýtý seçin (Þifreli dvdler için)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <baþlýkno> DVD baþlýðý çal. Baþlýk numarasýný gireblirsiniz.\n"
+" dvd://<baþlýkno> DVD baþlýðý çal. Baþlýk numarasýný gireblirsiniz.\n"
" -alang/-slang DVD dublaj/altyazý dili seçin (2-char country codu tarafýndan)\n"
#endif
" -ss <zamanpoz> Verilmiþ pozisyonu ara (saniye yada hh:mm:ss)\n"
diff --git a/help/help_mp-uk.h b/help/help_mp-uk.h
index b668e53c32..35bf93e80a 100644
--- a/help/help_mp-uk.h
+++ b/help/help_mp-uk.h
@@ -14,12 +14,12 @@ static char help_text[]=
"ïÐæ§:\n"
" -vo <drv[:dev]> ×ÉÂ¦Ò ÄÒÁÊ×ÅÒÁ ¦ ÐÒÉÓÔÒÏÀ צÄÅÏ ×É×ÏÄÕ (ÓÐÉÓÏË ÄÉ×. Ú '-vo help')\n"
" -ao <drv[:dev]> ×ÉÂ¦Ò ÄÒÁÊ×ÅÒÁ ¦ ÐÒÉÓÔÒÏÀ ÁÕÄ¦Ï ×É×ÏÄÕ (ÓÐÉÓÏË ÄÉ×. Ú '-ao help')\n"
-" -vcd <ÎÏÍÅÒ ÔÒÅËÕ> ÇÒÁÔÉ VCD (video cd) ÔÒÅË Ú ÐÒÉÓÔÒÏÀ ÚÁͦÓÔØ ÆÁÊÌÕ\n"
+" vcd://<ÎÏÍÅÒ ÔÒÅËÕ> ÇÒÁÔÉ VCD (video cd) ÔÒÅË Ú ÐÒÉÓÔÒÏÀ ÚÁͦÓÔØ ÆÁÊÌÕ\n"
#ifdef HAVE_LIBCSS
" -dvdauth <dev> ×ÉÂ¦Ò ÐÒÉÓÔÒÏÀ DVD ÄÌÑ Á×ÔÏÒÉÚÁæ§ (ÄÌÑ ÛÉÆÒÏ×ÁÎÉÈ ÄÉÓ˦×)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <ÎÏÍÅÒ ÔÉÔÒ¦×> ÇÒÁÔÉ DVD ÔÉÔÒÉ/ÔÒÅË Ú ÐÒÉÓÔÒÏÀ ÚÁͦÓÔØ ÆÁÊÌÕ\n"
+" dvd://<ÎÏÍÅÒ ÔÉÔÒ¦×> ÇÒÁÔÉ DVD ÔÉÔÒÉ/ÔÒÅË Ú ÐÒÉÓÔÒÏÀ ÚÁͦÓÔØ ÆÁÊÌÕ\n"
#endif
" -ss <ÞÁÓ> ÐÅÒÅͦÓÔÉÔÉÓÑ ÎÁ ÚÁÄÁÎÕ (ÓÅËÕÎÄÉ ÁÂÏ çç:íí:óó) ÐÏÚÉæÀ\n"
" -nosound ÂÅÚ Ú×ÕËÕ\n"
diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h
index fdca77b1ca..e12ad01b18 100644
--- a/help/help_mp-zh_CN.h
+++ b/help/help_mp-zh_CN.h
@@ -16,13 +16,13 @@ static char help_text[]=
" -vo <drv[:dev]> Ñ¡ÔñÊÓƵÊä³öģʽºÍÉ豸(ÓÃ'-vo help'²é¿´Áбí)\n"
" -ao <drv[:dev]> Ñ¡ÔñÒôƵÊä³öģʽºÍÉ豸(ÓÃ'-ao help'²é¿´Áбí)\n"
#ifdef HAVE_VCD
-" -vcd <trackno> ´ÓÉ豸¶ø²»ÊÇÆÕͨÎļþÉϲ¥·ÅVCD(video cd)track\n"
+" vcd://<trackno> ´ÓÉ豸¶ø²»ÊÇÆÕͨÎļþÉϲ¥·ÅVCD(video cd)track\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <dev> ΪDVDÉ豸ÉèÖÃÊÚȨÂë(ÓÃÓÚ¼ÓÃܹâÅÌ)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titleno> ´ÓÉ豸¶ø²»ÊÇÆÕͨÎļþÉϲ¥·ÅDVD title/track\n"
+" dvd://<titleno> ´ÓÉ豸¶ø²»ÊÇÆÕͨÎļþÉϲ¥·ÅDVD title/track\n"
" -alang/-slang Ñ¡ÔñDVDÒô¹ì/×ÖÄ»µÄÓïÑÔ(ʹÓÃÁ½Î»µÄ¹ú¼Ò´úÂë)\n"
#endif
" -ss <timepos> Ñ°ÕÒÖ¸¶¨µÄ(¶àÉÙÃë»òhh:mm:ss)λÖÃ\n"
diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h
index 0db5d6094a..6cd18a8e7b 100644
--- a/help/help_mp-zh_TW.h
+++ b/help/help_mp-zh_TW.h
@@ -17,13 +17,13 @@ static char help_text[]=
" -vo <drv[:dev]> ¿ï¾Üµø°T¿é¥XÅX°Êµ{¦¡¤Î¸Ë¸m (¥Î '-vo help' ¬d¬Ý¦Cªí)\n"
" -ao <drv[:dev]> ¿ï¾Ü­µ®Ä¿é¥XÅX°Êµ{¦¡¤Î¸Ë¸m (¥Î '-ao help' ¬d¬Ý¦Cªí)\n"
#ifdef HAVE_VCD
-" -vcd <trackno> ±q¸Ë¸m¦Ó¨Ã«D¤@¯ëÀÉ®×¼½©ñ VCD (Video CD) track\n"
+" vcd://<trackno> ±q¸Ë¸m¦Ó¨Ã«D¤@¯ëÀÉ®×¼½©ñ VCD (Video CD) track\n"
#endif
#ifdef HAVE_LIBCSS
" -dvdauth <dev> «ü©w­n±ÂÅvªº DVD ¸Ë¸m (¥Î©ó¥[±K¥úºÐ)\n"
#endif
#ifdef USE_DVDREAD
-" -dvd <titleno> ±q¸Ë¸m¦Ó¨Ã«D¤@¯ëÀÉ®×¼½©ñ DVD title\n"
+" dvd://<titleno> ±q¸Ë¸m¦Ó¨Ã«D¤@¯ëÀÉ®×¼½©ñ DVD title\n"
" -alang/-slang ¿ï¾Ü DVD ­µ®Ä/¦r¹õªº»y¨¥ (¨Ï¥Î¨â¦ìªº°ê®a¥N¸¹)\n"
#endif
" -ss <timepos> ·j¯Á¦Ü«ü©w (¬í©Î hh:mm:ss) ªº¦ì¸m\n"
diff --git a/libmpdemux/dvdauth.c b/libmpdemux/dvdauth.c
index 77e907f75b..9d50cf0aed 100644
--- a/libmpdemux/dvdauth.c
+++ b/libmpdemux/dvdauth.c
@@ -288,7 +288,7 @@ int dvd_auth ( char *dev , char *filename )
}
if (!(*dl_CSSisEncrypted)(dvd)) {
- printf("DVD: DVD is unencrypted! Skipping authentication!\n(note: you should not use -dvd switch for unencrypted discs!)\n");
+ printf("DVD: DVD is unencrypted! Skipping authentication!\n(note: you should not use dvd:// switch for unencrypted discs!)\n");
DVDCloseDevice(dvd);
return 0;
} else printf("DVD: DVD is encrypted, issuing authentication ...\n");