vobsub documented

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4087 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 35 insertions, 7 deletions

diff --git a/DOCS/Hungarian/mplayer.1 b/DOCS/Hungarian/mplayer.1
index 1c7dd2fae2..16f238de8e 100644
--- a/DOCS/Hungarian/mplayer.1
+++ b/DOCS/Hungarian/mplayer.1
@@ -36,6 +36,8 @@ mplayer \- Filmlejátszó Linuxra
 .RB [ \-sub\ <file> ]
 .RB [ \-subfps\ <ráta> ]
 .RB [ \-subdelay\ <másodperc> ]
+.RB [ \-vobsub\ <vobsub\ file\ kiterjesztés\ nélkül> ]
+.RB [ \-vobsubid\ <vobsub\ felirat\ id> ]
 .RB [ \-z\ <0-8> ]
 .RB [ \-idx ]
 .RB [ \-forceidx ]
@@ -264,6 +266,14 @@ fileoknál lehetséges!) Alapállapot: a film kk/mp értéke.
 a feliratok kezdőidejének késleltetése a megadott időtartammal. Lehet
 negatív is.
 .TP
+.B \-vobsub\ <vobsub\ file\ kiterjesztés\ nélkül>
+vobsub tipusú felirat használata esetén itt adandók meg a feliratot tartalmazó
+file-ok. Kiterjesztések (.idx, .ifo, .sub) nélkül kell megadni !
+.TP
+.B \-vobsub\ <vobsub\ felirat\ id>
+amennyiben a vobsub-ban több felirat is van, itt lehet kiválasztani hogy
+melyik legyen használva (0-31).
+.TP
 .B \-osdlevel\ <fokozat>
 megadja hogy az OSD milyen módban induljon (0 : nincs, 1 : kereső, 2: kereső+timer)
 (alap = 2)
@@ -669,8 +679,8 @@ Kell lennie ott egy font.desc file-nak, és .RAW kiterjesztésű
 betűtipusoknak.
 .TP
 .I FELIRATFILEOK
-Az MPlayer jelenleg 9 fajtát támogat : MicroDVD, SubRip, unnamed,
-SAMI (smi), vplayer, RealMedia RT, ssa (Sub Station Alpha), AQT, MPsub.
+Az MPlayer jelenleg 10 fajtát támogat : MicroDVD, SubRip, unnamed,
+SAMI (smi), vplayer, RealMedia RT, ssa (Sub Station Alpha), AQT, VobSub, MPsub.
 A fileokat ebben a sorrendben keresi : (például /mnt/cdrom/movie.avi)
     /mnt/cdrom/movie.sub
      (utf/UTF/sub/SUB/srt/SRT/smi/SMI/rt/RT/txt/TXT/ssa/SSA)
diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index e8204e9f3c..77c496d6a6 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -247,7 +247,7 @@ of them supports software or hardware scaling, so you can enjoy movies in
 fullscreen. <B>MPlayer</B> supports displaying through some hardware MPEG
 decoder boards, such as the <B><A HREF="DVB">DVB</A></B> and <B> <A
 HREF="DXR3">DXR3/Hollywood+</A></B> ! And what about the nice big antialiased
-shaded subtitles (<B>9 supported types!!!</B>) with european/ISO 8859-1,2
+shaded subtitles (<B>10 supported types!!!</B>) with european/ISO 8859-1,2
 (hungarian, english, czech, etc), cyrillic, korean fonts, and OSD?</P>
 
 <P><B>MPlayer</B> is basically GPL, but contains some non-GPL code which is not
@@ -584,9 +584,17 @@ directive to use the skin in <CODE>*/Skin/newskin</CODE> directory.</P>
 <P><B><A NAME=1.5>1.5. Subtitles and OSD</A></B></P>
 
 <P>Yes, <B>MPlayer</B> also supports many kinds of subtitles. Currently
-8 kinds of subtitle can be used by the subreader code. To see what are
+10 kinds of subtitle can be used by the subreader code. To see what are
 these subtitle formats, see subreader.c, line ~30.</P>
 
+<P><B>MPlayer</B> supports VobSub subtitles. VobSub subtitles consist of
+a big (some megabytes) .SUB file, an .IDX file, and/or an .IFO file.
+Usage : if you have files like <CODE>sample.sub</CODE>, <CODE>sample.ifo</CODE>,
+<CODE>sample.idx</CODE> - you have to pass the <CODE>-vobsub sample -vobsubid
+0</CODE> options (optionally with pathname, of course). The
+<CODE>-vobsubid</CODE> option is like <CODE>-sid</CODE> for DVDs, you can
+choose between subtitle tracks (languages) with it.</P>
+
 <P>About DVD subtitles, read the <A HREF="cd-dvd.html#4.2">DVD section</A>.</P>
 
 <P><B>MPlayer</B> introduces a new subtitle format called <B><I>MPsub</I></B>.
@@ -1426,7 +1434,7 @@ No closer info yet.</P>
 
 <LI><B><A HREF="mailto:kmkaplan@selfoffice.com">Kim Minh Kaplan</A></B>
 <UL>
-  <LI>DVD subtitles display support</LI>
+  <LI>DVD and VobSub subtitles display support</LI>
 </UL></LI>
 
 <LI><B><A HREF="mailto:bkuschak@yahoo.com">Brian Kuschak</A></B>
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 47396fd377..39645eb217 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -37,6 +37,8 @@ mplayer \- Movie Player for Linux
 .RB [ \-sub\ <filename> ]
 .RB [ \-subfps\ <rate> ]
 .RB [ \-subdelay\ <seconds> ]
+.RB [ \-vobsub\ <vobsub\ file\ without\ extention> ]
+.RB [ \-vobsubid\ <vobsub\ subtitle\ id> ]
 .RB [ \-z\ <0-9> ]
 .RB [ \-idx ]
 .RB [ \-forceidx ]
@@ -259,6 +261,14 @@ specify frame/sec rate of subtitle file (float number)
 .B \-subdelay\ <sec>
 delays subtitles by <sec> seconds. Can be negative.
 .TP
+.B \-vobsub\ <vobsub\ file\ without\ extention>
+specify the VobSub files that are to be used for subtitle.  This is
+the full pathname without extensions, i.e. without the ".idx", ".ifo"
+or ".sub".
+.TP
+.B \-vobsubid\ <vobsub\ subtitle\ id>
+specify the VobSub subtitle id.  Valid values range from 0 to 31.
+.TP
 .B \-osdlevel\ <level>
 specifies which mode the OSD should start in (0 : none, 1 : seek, 2: seek+timer)
 (default = 2)
@@ -739,8 +749,8 @@ Fonts are searched in $HOME/.mplayer/font. There must be a font.desc
 file, and files with .RAW extension.
 .TP
 .I SUBTITLE FILES
-MPlayer currently supports 9 subtitle formats : MicroDVD, SubRip, unnamed,
-SAMI (smi), vplayer, RealMedia RT, ssa (Sub Station Alpha), AQT, and our own: MPsub.
+MPlayer currently supports 10 subtitle formats : MicroDVD, SubRip, unnamed,
+SAMI (smi), vplayer, RealMedia RT, ssa (Sub Station Alpha), AQT, VobSub, and our own: MPsub.
 Sub files are searched in this priority : (for example /mnt/cdrom/movie.avi)
     /mnt/cdrom/movie.sub
      (utf/UTF/sub/SUB/srt/SRT/smi/SMI/rt/RT/txt/TXT/ssa/SSA)