applied 2 patches

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

3 files changed, 177 insertions, 20 deletions

diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index 572ea9213f..6bdb178992 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -676,18 +676,58 @@ 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
-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> can display subtitles along with movie files. Currently the following 
+formats are supported:
+<UL>
+<LI>VobSub</LI>
+<LI>Microdvd</LI>
+<LI>SubRip</LI>
+<LI>SubViewer</LI>
+<LI>Sami</LI>
+<LI>VPlayer</LI>
+<LI>RT</LI>
+<LI>SSA</LI>
+<LI>MPsub</LI>
+<LI>AQTitle</LI>
+</UL>
+The command line options differ slightly for the different formats:
+</P>
 
-<P><B>MPlayer</B> supports VobSub subtitles. VobSub subtitles consist of
-a big (some megabytes) .SUB file, and optional .IDX and/or .IFO files.
+<P>
+<B>VobSub subtitles</B><BR> 
+VobSub subtitles consist of a big (some megabytes) .SUB file, and optional 
+.IDX and/or .IFO files.<BR>
 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
+&lt;id&gt;</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>
+<B>Other subtitles</B><BR>
+The other formats consist of a single text file containing timing, placement
+and text information.<BR>
+Usage : if you have a file like <CODE>sample.txt</CODE>, you have to pass 
+the option <CODE>-sub sample.txt (optionally with pathname, of course). 
+</P>
+
+<P>
+<B>Adjusting subtitle timing and placement</B><BR>
+
+<CODE>-subdelay &lt;sec&gt;</CODE> : Delays subtitles by &lt;sec&gt; seconds. Can be negative.<BR>
+<CODE>-subfps &lt;rate&gt;</CODE> : Specify frame/sec rate of subtitle file (float number)<BR>
+<CODE>-subpos &lt;0 - 100&gt;</CODE> : Specify the position of subtitles.<BR>
+</P>
+<P>
+If you experience a growing delay between the movie and the subtitles when using a MicroDVD
+subtitle file, most likely the frame rate of the movie and the subtitle file are different.<BR>
+Please note that the MicroDVD subtitle format uses absolute frame numbers for its
+timing, and therefore the <CODE>-subfps</CODE> option cannot be used with this format. As 
+<B>MPlayer</B> has no way to guess the frame rate of the subtitle file, you have to manually
+convert the frame rate. There is a little perl script in the <CODE>contrib</CODE> directory of 
+the MPlayer ftp site to do this conversation for you. 
+
 <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>.
diff --git a/DOCS/encoding.html b/DOCS/encoding.html
index 4b56cf5dcb..65c96a39d0 100644
--- a/DOCS/encoding.html
+++ b/DOCS/encoding.html
@@ -168,6 +168,23 @@ commands are needed :<BR>
   -divx4opts br=1100 -oac copy -o movie.avi -pass 2</CODE>
 </P>
 
+<P><U><B>2 or 3-pass encoding using internal libavcodec controler</B></U> :
+Optionally you can use libavcodec's internal 2 or 3-pass mode, it may gives you
+better final rate accuracy than using the external, DivX4-inspired 2-pass rate
+controler with libavcodec.<BR>
+<UL>
+<B>2-pass encoding</B> :<BR>
+<CODE>rm -f lavc_stats.txt<BR>
+mencoder -dvd 2 -ovc lavc -lacvopts vpass=1 (audio-options) -o movie.avi<BR>
+mencoder -dvd 2 -ovc lavc -lacvopts vpass=2 (audio-options) -o movie.avi</CODE><BR>
+<BR>
+<B>3-pass encoding</B> :<BR>
+<CODE>rm -f frameno.avi lavc_stats.txt<BR>
+mencoder -dvd 2 -ovc frameno (audio-options) -o frameno.avi<BR>
+mencoder -dvd 2 -ovc lavc -lacvopts vpass=1 -oac copy -o movie.avi<BR>
+mencoder -dvd 2 -ovc lavc -lacvopts vpass=2 -oac copy -o movie.avi</CODE><BR>
+</UL>
+</P>
 
 <P><B><A NAME=2.4.3.2>2.4.3.2.  Rescaling movies</B></P>
 
diff --git a/DOCS/mencoder.1 b/DOCS/mencoder.1
index 7af578e458..8a992634b1 100644
--- a/DOCS/mencoder.1
+++ b/DOCS/mencoder.1
@@ -194,32 +194,132 @@ like:
 Available options:
 
   help           get help
-  vcodec=XXX     use the specified codec
-                 (for full list, see html doc!)
+
+  vcodec=XXX     use the specified codec :
+                   mjpeg - Motion JPEG
+                   h263 - H263
+                   h263p - H263 Plus
+                   mpeg4 - DivX 4/5
+                   msmpeg4 - DivX 3
+                   rv10 - an old RealVideo codec
+                   mpeg1video - MPEG1 video :)
+                 There's no default, you must
+                 specify it.
+
   vbitrate=XXX   specify bitrate in
                  kbit <4-16000> or
                  bit  <16001-24000000>
+                 (warning: 1kbit = 1000 bits)
+                 default = 800k
+
+  vratetol=XXX   approximated *filesize* tolerance
+                 in bits/kbits.
+                 (warning: 1kbit = 1000 bits)
+                 default = 1024*8 bits.
+
   keyint=XXX     interval between keyframes
-                 (specify in frames)
-  vhq            very high quality
-  vme=XXX        motion estimation method
-  vqmin=XXX      minimum quantizer
-  vqmax=XXX      maximum quantizer
-  vqdiff=XXX     quantizer difference. Limits the
-                 maximum quantizer difference
-                 between frames.
-  vratetol=XXX   approximated bitrate tolerance
+                 (specify in frames, >300 are not
+                 recommended)
+                 default = 250 (one key frame every
+                 ten seconds in a 25fps movie)
+
+  vhq            high quality mode, macro blocks
+                 will be encoded multiple times and
+                 the smallest will be used.
+                 default = HQ disabled
+
+  vme=XXX        [0..5] motion estimation method :
+                   0 - no ME at all
+                   1 - ME_FULL
+                   2 - ME_LOG
+                   3 - ME_PHODS
+                   4 - ME_EPZS
+                   5 - ME_X1
+                 EPZS usually gives best results,
+                 but you can try X1 too. FULL is
+                 very slow and the others are
+                 experimental.
+                 default = EPZS
+
   vqcomp=XXX     if the value is set to 1.0, the
                  quantizer will stay nearly
-                 constant. If it's 0.0, the
+                 constant (high motion scenes will
+                 look bad). If it's 0.0, the
                  quantizer will be changed
-                 to make all frames
-                 approximately equally sized.
+                 to make all frames approximately
+                 equally sized (low motion scenes
+                 will look bad).
+                 default = 0.5
+
   vqblur=XXX     blurs the quantizer graph over
                  time.
                     0.0 : no blur
                     1.0 : average all past
                           quantizers
+                 default = 0.5
+
+  vqscale=XXX    [2..31] gives each frame the same
+                 quantizer (selects fixed quantizer
+                 mode).
+                 default = 0 (fixed quantizer mode
+                 disabled)
+
+  vrc_strategy=X [0..2] different strategies to
+                 decide which frames should get
+                 which quantizer.
+                 default = 2
+
+  v4mv           4 motion vectors per macroblock,
+                 may gives you slightly better
+                 quality, can only be used in HQ
+                 mode and is buggy with B frames
+                 currently.
+                 default = disabled
+
+  vpass=X        [1,2] select internal first pass
+                 or second pass of 2-pass mode.
+                 default = 0 (1-pass mode)
+
+The next 3 options apply only to I & P frames :
+
+  vqmin=XX       [1..31] minimum quantizer,
+                 default = 3
+
+  vqmax=XX       [1..31] maximum quantizer
+                 default = 15
+
+  vqdiff=XX      [1..31] quantizer difference.
+                 Limits the maximum quantizer
+                 difference between frames.
+                 default = 3
+
+The following options apply only to B frames :
+
+  vmax_b_frames=X  [0..4] maximum number of frames
+                   between each I/P frame.
+                   default = 0 (B-frames generation
+                   disabled)
+
+  vb_strategy=X    strategy to choose between
+                   I/P/B frames :
+                     0 allways use max B
+                     1 avoid B frames in high
+                       motion / scene change (can
+                       lead to filesize miss
+                       prediction)
+                   default = 0
+
+In fixed quantizer mode you can use those options :
+  vqscale, vmax_b_frames, vhq, vme, keyint
+
+You can use the following options only in pass 1 of 2-pass mode or in 1-pass mode :
+  vqblur, vqdiff
+
+You can use the following options only in pass 2 of 2-pass mode :
+  vrc_strategy, vb_strategy
+
+All other options can be used in all modes.
+
 .TP
 .B \-lameopts
 If encoding to MP3 with libmp3lame, you can specify its parameters here, like: