[Mplayer-cvslog] CVS: main/DOCS encoding.html,1.35,1.36 mencoder.1,1.35,1.36 mplayer.1,1.159,1.160

[Winner of tha face compo]

Update of /cvsroot/mplayer/main/DOCS
In directory mail:/var/tmp.root/cvs-serv1433

Modified Files:
	encoding.html mencoder.1 mplayer.1 
Log Message:
updates


Index: encoding.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- encoding.html	28 Mar 2002 17:30:37 -0000	1.35
+++ encoding.html	20 Apr 2002 06:40:47 -0000	1.36
@@ -78,7 +78,9 @@
     <LI>input A/V synchronizing (PTS-based, can be disabled with -mc 0 option)</LI>
     <LI>FPS correction with <CODE>-ofps</CODE> option (useful when encoding
     29.97fps VOB to 24fps AVI)</LI>
-    <LI>movie rescaling</LI>
+    <LI>using our very powerful plugin system (crop, expand, flip, postprocess,
+      rotate, scale, rgb/yuv conversion)</LI>
+    <LI>can encode DVD/VOBsub <B>AND</B> text subtitles into the output file</LI>
   </UL>
 </P>
 

Index: mencoder.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/mencoder.1,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mencoder.1	20 Mar 2002 21:23:59 -0000	1.35
+++ mencoder.1	20 Apr 2002 06:40:47 -0000	1.36
@@ -43,6 +43,7 @@
 .RB [ \-ss\ <time> ]
 .RB [ \-endpos\ <time> ]
 .RB [ \-audiofile\ <file\ name> ]
+.RB [ \-sub\ <subtitle\ file\ name> ]
 .I - or file or files specified with escaped wildcard or device
 .PP
 .SH DESCRIPTION
@@ -276,6 +277,10 @@
     -ss 01:10:00   seeks to 1 hour 10 min
 
 Can start only from keyframes !
+.TP
+.B \-sub <subtitle file name>
+given VOBsub/text subtitle will be encoded INTO the output file. Text
+subtitles need fonts properly installed.
 .TP
 .B \-endpos <time>
 stop encoding at given time. Can be specified in many was :

Index: mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- mplayer.1	19 Apr 2002 01:08:00 -0000	1.159
+++ mplayer.1	20 Apr 2002 06:40:47 -0000	1.160
@@ -636,7 +636,7 @@
 Select video channel [MPG: 0\-15  ASF:  0\-255 ]
 .TP 
 .B \-vop <filter>
-Activate video filters (see documentation at DOCS/tech/vop.txt !).
+Activate video filters (see documentation!).
 .TP
 .B \-vsync
 Enables VBI for vesa