document new 2pass syntax, remove/fix lots of obsolete junk in docs

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

2 files changed, 19 insertions, 24 deletions

diff --git a/DOCS/encoding.html b/DOCS/encoding.html
index bad022ce1a..184e199637 100644
--- a/DOCS/encoding.html
+++ b/DOCS/encoding.html
@@ -106,9 +106,9 @@
     can come from a previous 3-pass encoding (it interferes with current
     one)<BR>
   <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc -lavcopts
-    vcodec=mpeg4:more_options -oac copy -o movie.avi -pass 1<BR>
+    vcodec=mpeg4:vpass=1:more_options -oac copy -o movie.avi<BR>
   &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc -lavcopts
-    vcodec=mpeg4:more_options -oac copy -o movie.avi -pass 2</CODE></P>
+    vcodec=mpeg4:vpass=2:more_options -oac copy -o movie.avi</CODE></P>
 
 <P><U><B>3-pass encoding:</B></U> this is an extension of 2-pass encoding,
   where the audio encoding takes place in a separate pass. This method enables
@@ -126,14 +126,14 @@
       prints the recommended bitrate values for 650Mb, 700Mb, and 800Mb
       destination sizes, after this pass finishes.</P></LI>
   <LI>Second pass:
-    <P><CODE>mencoder &lt;file/DVD&gt; -oac copy -pass 1
-      -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=&lt;bitrate&gt;</CODE></P>
+    <P><CODE>mencoder &lt;file/DVD&gt; -oac copy
+      -ovc lavc -lavcopts vcodec=mpeg4:vpass=1:vbitrate=&lt;bitrate&gt;</CODE></P>
     <P>Alias the first pass of DivX4 video encoding. 
       Optionally specify the video bitrate MEncoder printed at the end of
       the previous pass.</P></LI>
   <LI>Third pass:
-    <P><CODE>mencoder &lt;file/DVD&gt; -oac copy -pass 2
-      -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=&lt;bitrate&gt;</CODE></P>
+    <P><CODE>mencoder &lt;file/DVD&gt; -oac copy
+      -ovc lavc -lavcopts vcodec=mpeg4:vpass=2:vbitrate=&lt;bitrate&gt;</CODE></P>
     <P>Alias the second pass of DivX4 video encoding. 
       Optionally specify the video bitrate MEncoder printed at the end of
       the previous pass. In this pass, audio from <CODE>frameno.avi</CODE> will
@@ -148,9 +148,9 @@
   <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc frameno
     -o frameno.avi -oac mp3lame -lameopts vbr=3:more_options<BR>
   &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc
-    -lavcopts vcodec=mpeg4:more_options -oac copy -o movie.avi -pass 1<BR>
+    -lavcopts vcodec=mpeg4:vpass=1:more_options -oac copy -o movie.avi<BR>
   &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc lavc
-    -lavcopts vcodec=mpeg4:more_options -oac copy -o movie.avi -pass 2</CODE></P>
+    -lavcopts vcodec=mpeg4:vpass=2:more_options -oac copy -o movie.avi</CODE></P>
 
 <P><U><B>2 or 3-pass encoding using internal libavcodec controller:</B></U>
   Optionally you can use libavcodec's internal 2 or 3-pass mode, it may give
@@ -159,13 +159,13 @@
 
 <UL>
   <LI><B>2-pass encoding:</B><BR>
-    <CODE>rm -f lavc_stats.txt<BR>
+    <CODE>
     mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 (audio-options) -o
       movie.avi<BR>
     mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=2 (audio-options) -o
       movie.avi</CODE></LI>
   <LI><B>3-pass encoding:</B><BR>
-    <CODE>rm -f frameno.avi lavc_stats.txt<BR>
+    <CODE>rm -f frameno.avi<BR>
     mencoder -dvd 2 -ovc frameno (audio-options) -o frameno.avi<BR>
     mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o
       movie.avi<BR>
@@ -332,8 +332,8 @@ Explanation of the process:
   &nbsp;&nbsp;<CODE>rm subtitles.idx subtitles.sub</CODE><BR>
   &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 -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>Copying a french subtitle from an MPEG file</I><BR>
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 1f4a701d24..da0bc05305 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -1800,12 +1800,16 @@ rate control reaction period
 rate control reaction ratio
 .IPs crispness=<0\-100>
 specify crispness/\:smoothness
+.IPs pass=<1\-2>
+With this you can encode 2pass DivX4 files.
+First encode with pass=1, then with the same parameters, encode with
+pass=2.
 .IPs vbrpass=<0\-2>
-Override the -pass argument and use XviD VBR Library instead of DivX4
+Override the pass argument and use XviD VBR Library instead of DivX4
 VBR.  Available options are:
 .
 .RSss
-0: one pass encoding (as in not putting -pass on the command line)
+0: one pass encoding (as in not putting pass on the command line)
 .br
 1: Analysis (first) pass of two pass encoding.
 The resulting AVI file can be directed to /dev/null.
@@ -2316,15 +2320,6 @@ encode with a libavcodec codecs
 .PD 1
 .
 .TP
-.B \-pass <1/\:2>
-With this you can encode 2pass DivX4 files.
-First encode with \-pass\ 1, then with the same parameters, encode with
-\-pass\ 2.
-
-.I NOTE:
-.br
-Use \-lavcopts vpass=1/\:2 for libavcodec 2-pass instead of \-pass\ 1/\:2.
-.TP
 .B \-passlogfile <filename>
 When encoding in 2pass mode, MEncoder dumps first pass' informations
 to the given file instead of the default divx2pass.log.
@@ -2685,7 +2680,7 @@ mencoder \-tv on:driver=v4l:width=640:height=480 \-o tv.avi \-ovc rawrgb
 .TP
 .B Encoding from a pipe
 rar p test-SVCD.rar | mencoder \-ovc divx4 \-divx4opts br=800 \-ofps 24
-\-pass\ 1 \-\- \-
+\-\- \-
 .TP
 .B Encoding multiple *.vob files
 cat *.vob | mencoder <options> \-