From d7bf90d3c08d300a59f935ca6583aaa210c29f68 Mon Sep 17 00:00:00 2001
From: jonas <jonas@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 9 Jul 2003 20:10:48 +0000
Subject: [PATCH] -dvd -> dvd:// and -vcd -> vcd://
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10406 b3059339-0415-0410-9bf9-f77b7e298cf2
---
DOCS/de/cd-dvd.html | 10 +++++-----
DOCS/de/documentation.html | 10 +++++-----
DOCS/de/encoding.html | 18 +++++++++---------
DOCS/de/mplayer.1 | 24 ++++++++++++------------
DOCS/hu/cd-dvd.html | 6 +++---
DOCS/hu/documentation.html | 10 +++++-----
DOCS/hu/encoding.html | 18 +++++++++---------
DOCS/hu/mplayer.1 | 24 ++++++++++++------------
DOCS/it/cd-dvd.html | 12 ++++++------
DOCS/it/documentation.html | 10 +++++-----
DOCS/it/encoding.html | 18 +++++++++---------
DOCS/pl/cd-dvd.html | 6 +++---
DOCS/pl/documentation.html | 8 ++++----
DOCS/pl/encoding.html | 18 +++++++++---------
DOCS/pl/mplayer.1 | 24 ++++++++++++------------
DOCS/tech/encoding-tips.txt | 6 +++---
DOCS/zh/cd-dvd.html | 10 +++++-----
DOCS/zh/documentation.html | 10 +++++-----
DOCS/zh/encoding.html | 18 +++++++++---------
DOCS/zh/mplayer.1 | 24 ++++++++++++------------
README | 4 ++--
TOOLS/dvd2divxscript.pl | 2 +-
TOOLS/mencvcd | 4 ++--
help/help_mp-bg.h | 4 ++--
help/help_mp-cs.h | 4 ++--
help/help_mp-de.h | 4 ++--
help/help_mp-dk.h | 4 ++--
help/help_mp-el.h | 4 ++--
help/help_mp-en.h | 4 ++--
help/help_mp-es.h | 4 ++--
help/help_mp-fr.h | 4 ++--
help/help_mp-hu.h | 4 ++--
help/help_mp-it.h | 4 ++--
help/help_mp-ko.h | 4 ++--
help/help_mp-nl.h | 4 ++--
help/help_mp-no.h | 4 ++--
help/help_mp-pl.h | 4 ++--
help/help_mp-pt_BR.h | 4 ++--
help/help_mp-ro.h | 4 ++--
help/help_mp-ru.h | 4 ++--
help/help_mp-sk.h | 4 ++--
help/help_mp-tr.h | 4 ++--
help/help_mp-uk.h | 4 ++--
help/help_mp-zh_CN.h | 4 ++--
help/help_mp-zh_TW.h | 4 ++--
libmpdemux/dvdauth.c | 2 +-
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ügbaren Optionen willst. Die Syntax bei einer normalen Digital
Versatile Disc (DVD) sieht wie folgt aus:</P>
-<P><CODE>mplayer -dvd <track> [-dvd-device <Gerät>]</CODE></P>
+<P><CODE>mplayer dvd://<track> [-dvd-device <Gerät>]</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ät ist <CODE>/dev/dvd</CODE>. Wenn das bei dir
anders ist, so erstelle einen symbolischen Link auf das richtige Gerät,
@@ -256,11 +256,11 @@ nur unter Linux). <B>Warnung:</B> Du kannst nur fünf mal den Gebietscode
<P><B>Abspielen von Standard Video-CDs:</B></P>
-<P><CODE>mplayer -vcd <Tracknummer> [-cdrom-device
+<P><CODE>mplayer vcd://<Tracknummer> [-cdrom-device
<Gerät>]</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. Ähnlich wie bei Audio-CDs kö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, ü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ür die jeweilige Datei/URL/etc gelten
<TABLE BORDER=0>
<TR><TD> </TD><TD>Datei</TD><TD> </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ür datei1] datei2 datei3 [Optionen fü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ür einfach dsa DVD-Gerät
korrekt:</P>
-<P><CODE>mplayer -dvd <Titel> -dvd-device '\\.\d:'</CODE></P>
+<P><CODE>mplayer dvd://<Titel> -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üheren 3-Pass-Encodierung kommen kann (Sie führt zu
einem Konflikt mit der momentanen Encodierung).<BR>
-<CODE> mencoder -dvd 2 -lavcopts
+<CODE> mencoder dvd://2 -lavcopts
vcodec=mpeg4:vpass=1 -oac copy -o film.avi</CODE><BR>
-<CODE> mencoder -dvd 2 -lavcopts
+<CODE> 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üheren 3-Pass-Encodierung kommen kann (Sie führt
zu einem Konflikt mit der momentanen Encodierung).<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>
@@ -219,7 +219,7 @@ Codecs encodieren:</P>
<CODE>-lavcopts vcodec=msmpeg4</CODE></P>
<P>Ein Beispiel mit MJPEG-Compression:<BR>
-<CODE> mencoder -dvd 2 -o titel2.avi -ovc lavc -lavcopts
+<CODE> 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öscht werden.</P>
<CODE>rm untertitel.idx untertitel.sub</CODE><BR>
- <CODE>mencoder -dvd 1 -vobsubout untertitel -vobsuboutindex 0 -sid
+ <CODE>mencoder dvd://1 -vobsubout untertitel -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
+ <CODE>mencoder dvd://1 -oac copy -ovc divx4 -divx4opts
pass=1</CODE><BR>
- <CODE>mencoder -dvd 1 -oac copy -ovc divx4 -divx4opts pass=2
+ <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
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
.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 <s�v> [-dvd-device <egys�g>]</CODE></P>
+<P><CODE>mplayer dvd://<s�v> [-dvd-device <egys�g>]</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
<P><TABLE BORDER=0>
<TR><TD> </TD><TD>file</TD><TD> </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
</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 <s�v> -dvd-device '\\.\d:'</CODE></P>
+<P><CODE>mplayer dvd://<s�v> -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> 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> mencoder -dvd 2 -ovc lavc -lavcopts
+ <CODE> mencoder dvd://2 -ovc lavc -lavcopts
vcodec=mpeg4:opci�k -oac copy -o film.avi -pass 1<BR>
- <CODE> mencoder -dvd 2 -ovc lavc -lavcopts
+ <CODE> 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> 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> mencoder -dvd 2 -ovc frameno
+ <CODE> mencoder dvd://2 -ovc frameno
-o frameno.avi -oac mp3lame -lameopts vbr=3:opci�k<BR>
- mencoder -dvd 2 -ovc lavc
+ mencoder dvd://2 -ovc lavc
-lavcopts vcodec=mpeg4:vbitrate=1100 -oac copy -o movie.avi -pass 1<BR>
- mencoder -dvd 2 -ovc lavc
+ 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> mencoder -dvd 2 -o title2.avi -ovc lavc
+ <CODE> 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>
<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 -pass 1</CODE><BR>
- <CODE>mencoder -dvd 1 -oac copy -ovc divx4 -pass 2 -vobsubout
+ <CODE>mencoder dvd://1 -oac copy -ovc divx4 -pass 1</CODE><BR>
+ <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
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
.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
.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 <track> [-dvd-device <device>]</CODE></P>
+<P><CODE>mplayer dvd://<track> [-dvd-device <device>]</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> </TD><TD>file</TD><TD> </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 <title> -dvd-device '\\.\d:'</CODE></P>
+<P><CODE>mplayer dvd://<title> -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> rm frameno.avi</CODE> - rimuovi questo file che pu� essere rimasto
da una precedente codifica a 3 passaggi (interferisce col processo attuale)<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>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> rm frameno.avi</CODE> - rimuovi questo file,
che pu� essere rimasto da una precedente codifica a 3 passaggi (interferisce con quella attuale)<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>
<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> mencoder -dvd 2 -o title2.avi -ovc lavc
+ <CODE> 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>
<CODE>rm sottotitoli.idx sottotitoli.sub</CODE><BR>
- <CODE>mencoder -dvd 1 -vobsubout sottotitoli -vobsuboutindex 0
+ <CODE>mencoder dvd://1 -vobsubout sottotitoli -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>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 <�cie�ka> [-cdrom-device <uz�dzenie>]</CODE></P>
+<P><CODE>mplayer vcd://<�cie�ka> [-cdrom-device <uz�dzenie>]</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> rm frameno.avi</CODE> - usu� plik, kt�ry mo�e
pochodzi� z poprzedniego 3-krokowego kodowania (mo�e kolidowa� z obecnym)<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>Kodowanie 3-krokowe:</B></U> to przed�u�enie 2-krokowego kodowania,
@@ -75,11 +75,11 @@
<P><CODE> rm frameno.avi</CODE> - usu� plik, kt�ry mo�e
pochodzi� z poprzedniego 3-krokowego kodowania (mo�e kolidowa� z obecnym)<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>
@@ -185,7 +185,7 @@ format
<CODE>vcodec</CODE>, czyli: <CODE>-lavcopts vcodec=msmpeg4</CODE></P>
<P>Przyk�ad z kompresj� MJPEG:<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>
@@ -265,10 +265,10 @@ RAW RGB AVI.</P>
<P><I>Kopiowanie dw�ch napis�w z DVD podczas kodowania 3-krokowego</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>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
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
.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
.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
<P>����ѡ��������б��μ�man page�����ű������ֶ�ܵ�Ƭ(DVD)������£�</P>
-<P><CODE>mplayer -dvd <track> [-dvd-device <device>]</CODE></P>
+<P><CODE>mplayer dvd://<track> [-dvd-device <device>]</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
<P>���ű���Video CDs��</P>
-<P><CODE>mplayer -vcd <track> [-cdrom-device <device>]</CODE></P>
+<P><CODE>mplayer vcd://<track> [-cdrom-device <device>]</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
(ͼ�����ֵȵ�)��</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)
<TABLE BORDER=0>
<TR><TD> </TD><TD>��һ�ļ�</TD><TD> </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)
<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ͷ
<P>DVDͬ�����ԣ������������DVD�豸���ó����CD-ROM��������</P>
-<P><CODE>mplayer -dvd <title> -dvd-device '\\.\d:'</CODE></P>
+<P><CODE>mplayer dvd://<title> -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">
<P>���������ʾ��ΰ�DVD�����Ϊ2-pass��MPEG-4("DIVX")��AVI��ֻ��Ҫ�������<BR>
<CODE> rm frameno.avi</CODE> -- ɾ������ļ���������������ǰ��3-pass����(������ŵ�ǰ����)<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���룺</B></U>����2-pass�������չ������Ƶ�ı���ʹ��һ�������ı��롣���ַ����ṩ�Ƽ���Ƶ�����ʵĹ�����ʹ֮�ܹ��ʺ�CD��������ͬʱ��
@@ -54,11 +54,11 @@ MEncoder
<H4>3-pass��������ӣ�</H4>
<P><CODE> rm frameno.avi</CODE> -- ��ȥ����ļ���������������ǰ��3-pass����(������ŵ�ǰ����)<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>
<H2><A NAME="mpeg">7.2 ����ΪMPEG��ʽ</A></H2>
@@ -141,7 +141,7 @@ MEncoder
<P>��һ����Ӧ����<CODE>vcodec</CODE>ѡ�������õı����ʽ�����ƣ����磺<CODE>-lavcopts vcodec=msmpeg4</CODE></P>
<P>���磬����ʹ��MJPEGѹ����<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>
@@ -204,10 +204,10 @@ MPNG(Motion PNG )
<P><I>�ڽ���3-pass�����ͬʱ��DVD����������Ļ</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</CODE><BR>
- <CODE>mencoder -dvd 1 -oac copy -ovc divx4 -pass 1</CODE><BR>
- <CODE>mencoder -dvd 1 -oac copy -ovc divx4 -pass 2 -vobsubout
+ <CODE>mencoder dvd://1 -oac copy -ovc divx4 -pass 1</CODE><BR>
+ <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
.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��ѡ��ij���
-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");