# HG changeset patch
# User diego
# Date 1036807634 0
# Node ID 630360b150890513ba41eb69a5020747cef5c975
# Parent  06b20316d8cb774a26ae529a8d559eda7f7f3ee8
Redundant compilation section removed, MEncoder features section moved to
documentation.html below MPlayer features section, sections renumbered to
reflect these changes.

diff -r 06b20316d8cb -r 630360b15089 DOCS/documentation.html
--- a/DOCS/documentation.html	Sat Nov 09 01:31:45 2002 +0000
+++ b/DOCS/documentation.html	Sat Nov 09 02:07:14 2002 +0000
@@ -181,19 +181,13 @@
       </LI>
       <LI><A HREF="encoding.html">2.4 Encoding with MEncoder</A>
         <UL>
-          <LI><A HREF="encoding.html#compilation">2.4.1 Compilation</A></LI>
-          <LI><A HREF="encoding.html#features">2.4.2 MEncoder Features</A>
-            <UL>
-              <LI><A HREF="encoding.html#2pass">2.4.2.1 Encoding 2 or 3-pass DivX4</A></LI>
-              <LI><A HREF="encoding.html#rescaling">2.4.2.2 Rescaling movies</A></LI>
-              <LI><A HREF="encoding.html#copying">2.4.2.3 Stream copying</A></LI>
-              <LI><A HREF="encoding.html#fixing">2.4.2.4 Fixing AVIs with broken index</A></LI>
-              <LI><A HREF="encoding.html#libavcodec">2.4.2.5 Encoding with the libavcodec codec family</A></LI>
-              <LI><A HREF="encoding.html#image_files">2.4.2.6 Encoding from multiple input image files (JPEGs or PNGs)</A></LI>
-              <LI><A HREF="encoding.html#vobsub">2.4.2.7 Extracting DVD subtitles to Vobsub file</A></LI>
-            </UL>
-          </LI>
-          <LI><A HREF="encoding.html#options">2.4.3 Available options</A></LI>
+          <LI><A HREF="encoding.html#2pass">2.4.1 Encoding 2 or 3-pass DivX4</A></LI>
+          <LI><A HREF="encoding.html#rescaling">2.4.2 Rescaling movies</A></LI>
+          <LI><A HREF="encoding.html#copying">2.4.3 Stream copying</A></LI>
+          <LI><A HREF="encoding.html#fixing">2.4.4 Fixing AVIs with broken index</A></LI>
+          <LI><A HREF="encoding.html#libavcodec">2.4.5 Encoding with the libavcodec codec family</A></LI>
+          <LI><A HREF="encoding.html#image_files">2.4.6 Encoding from multiple input image files (JPEGs or PNGs)</A></LI>
+          <LI><A HREF="encoding.html#vobsub">2.4.7 Extracting DVD subtitles to a Vobsub file</A></LI>
         </UL>
       </LI>
       <LI><A HREF="#tv">2.5 TV input</A>
@@ -332,8 +326,6 @@
   (Hungarian, English, Czech, etc), Cyrillic, Korean fonts, and the onscreen
   display (OSD)?</P>
 
-<P>MPlayer is under GPL v2 license.</P>
-
 <P>The player is rock solid playing damaged MPEG files (useful for some VCDs),
   and it plays bad AVI files which are unplayable with the famous
   windows media player. Even AVI files without index chunk are playable, and
@@ -342,6 +334,49 @@
   As you see, stability and quality are the most important things,
   but the speed is also amazing.</P>
 
+<P>MEncoder (MPlayer's Movie Encoder) is a simple movie encoder,
+  designed to encode MPlayer-playable movies
+  (<B>AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA</B>) to other
+  MPlayer-playable formats (see below). It can encode with various codecs, like
+  <B>DivX4</B> (1 or 2 passes), libavcodec,
+  <B>PCM</B>/<B>MP3</B>/<B>VBR MP3</B> audio. Also has powerful plugin system
+  for video manipulation.</P>
+
+<H4>MEncoder features</H4>
+
+<UL>
+  <LI>encoding from the wide range of fileformats and decoders of MPlayer</LI>
+  <LI>encoding to all the codecs of ffmpeg's
+    <A HREF="codecs.html#libavcodec">libavcodec</A></LI>
+  <LI>video encoding from <B>V4L compatible TV tuners</B></LI>
+  <LI>encoding/multiplexing to interleaved AVI files with proper index</LI>
+  <LI>creating files from external audio stream</LI>
+  <LI>1, 2 or 3 pass encoding</LI>
+  <LI><B>VBR</B> MP3 audio - <B>IMPORTANT NOTE:</B> VBR MP3 audio doesn't
+    always play nicely on Windows players! On the other hand, currently
+    MEncoder's CBR encoding is totally broken on Win32 players :)</LI>
+  <LI>PCM audio</LI>
+  <LI>stream copying</LI>
+  <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>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>
+  <LI>can rip DVD subtitles to Vobsub format</LI>
+</UL>
+
+<H4>Planned features</H4>
+
+<UL>
+  <LI>even wider variety of available en/decoding formats/codecs
+    (creating VOB files with DivX4/Indeo5/VIVO streams :)</LI>
+  <LI>audio encoding from v4l (DONE for FreeBSD ?)</LI>
+</UL>
+
+<P>MPlayer and MEncoder can be distributed under the terms of the GNU General
+  Public License Version 2.</P>
+
 
 <H2><A NAME="history">1.1 History</A></H2>
 
diff -r 06b20316d8cb -r 630360b15089 DOCS/encoding.html
--- a/DOCS/encoding.html	Sat Nov 09 01:31:45 2002 +0000
+++ b/DOCS/encoding.html	Sat Nov 09 02:07:14 2002 +0000
@@ -12,84 +12,10 @@
 
 <H2><A NAME="encoding">2.4 Encoding with MEncoder</A></H2>
 
-<P>MEncoder (MPlayer's Movie Encoder) is a simple movie encoder,
-  designed to encode MPlayer-playable movies
-  (<B>AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA</B>) to other
-  MPlayer-playable formats (see below). It can encode with various codecs, like
-  <B>DivX4</B> (1 or 2 passes), libavcodec,
-  <B>PCM</B>/<B>MP3</B>/<B>VBR MP3</B> audio. Also has powerful plugin system
-  for video manipulation.</P>
-
-
-<H3><A NAME="compilation">2.4.1 Compilation</A></H3>
+<P>For the complete list of available MEncoder options and examples, please see
+  the man page.</P>
 
-<UL>
-  <LI><B>OPTIONAL</B> - read MPlayer's compilation instruction.</LI>
-  <LI><B>OPTIONAL (LINUX ONLY)</B> - download the newest <B>DivX4linux</B> libs
-    from <A HREF="http://avifile.sourceforge.net/download.htm">avifile.sourceforge.net</A>,
-    and have them PROPERLY installed. You need them if you want DivX4
-    (1/2 pass) encoding.</LI>
-  <LI><B>OPTIONAL</B> - <A HREF="codecs.html#xvid">download and install
-    <B>XViD</B></A>. Not very useful, libavcodec's <I>mpeg4</I> codec
-    can encode with much better speed AND quality than XViD or DivX4/5.</LI>
-  <LI><B>OPTIONAL</B> - for libavcodec support, install libavcodec as
-    described in the <A HREF="codecs.html#libavcodec">libavcodec section</A>.</LI>
-  <LI><B>OPTIONAL</B> - download and compile <B>libmp3lame</B> (from lame 3.89beta or lame CVS).<BR>
-    <B>WARNING: DO NOT COMPILE LAME &lt; 3.90 WITH <U>GCC 2.96</U>! It won't
-    work properly!</B><BR>
-    This
-    is needed for CBR/VBR MP3 audio encoding ability. Note that a single
-    <CODE>lame</CODE> binary isn't sufficient. BTW: the less optimization
-    you use for lame, the better the quality will be. You can test
-    quality by running <CODE>make test</CODE> after lame's compiling process
-    is over. The resulting number should be less than <B>30</B>. Don't
-    panic if it's <B>400</B> or so, you shouldn't heard any audible
-    quality decrease. Oh, and if your compiler doesn't even run
-    <CODE>make test</CODE> ... Well, delete that <B>GCC 2.96</B> or upgrade
-    lame to at least <B>3.90</B>.</LI>
-  <LI><B>OPTIONAL</B> - <CODE>libjpeg</CODE> and <CODE>libpng</CODE> -
-    as described in the <A HREF="documentation.html#installation">Installation</A>
-    section</LI>
-</UL>
-
-<P>You are ready. As you probably know, other encoding tools need the
-  <I>avifile</I> library installed. MEncoder doesn't need it at all.</P>
-
-
-<H3><A NAME="features">2.4.2 MEncoder features</A></H3>
-
-<UL>
-  <LI>encoding from the wide range of fileformats and decoders of MPlayer</LI>
-  <LI>encoding to all the codecs of ffmpeg's
-    <A HREF="codecs.html#libavcodec">libavcodec</A></LI>
-  <LI>video encoding from <B>V4L compatible TV tuners</B></LI>
-  <LI>encoding/multiplexing to interleaved AVI files with proper index</LI>
-  <LI>creating files from external audio stream</LI>
-  <LI>1, 2 or 3 pass encoding</LI>
-  <LI><B>VBR</B> MP3 audio - <B>IMPORTANT NOTE:</B> VBR MP3 audio doesn't
-    always play nicely on Windows players! On the other hand, currently
-    MEncoder's CBR encoding is totally broken on Win32 players :)</LI>
-  <LI>PCM audio</LI>
-  <LI>stream copying</LI>
-  <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>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>
-  <LI>can rip DVD subtitles to Vobsub format</LI>
-</UL>
-
-<H4>Planned features:</H4>
-
-<UL>
-  <LI>even wider variety of available en/decoding formats/codecs
-    (creating VOB files with DivX4/Indeo5/VIVO streams :)</LI>
-  <LI>audio encoding from v4l (DONE for FreeBSD ?)</LI>
-</UL>
-
-
-<H4><A NAME="2pass">2.4.2.1 Encoding 2 or 3-pass DivX4</A></H4>
+<H3><A NAME="2pass">2.4.1 Encoding 2 or 3-pass DivX4</A></H3>
 
 <P><U><B>2-pass encoding:</B></U> the name comes from the fact that this method
   encodes the file <I>twice</I>. The first encoding (dubbed <I>pass</I>)
@@ -174,7 +100,7 @@
 </UL>
 
 
-<H4><A NAME="rescaling">2.4.2.2 Rescaling movies</A></H4>
+<H3><A NAME="rescaling">2.4.2 Rescaling movies</A></H3>
 
 <P>Often the need to resize movie images' size emerges. Its reasons can be many,
   examples are decreasing output file size, encoding SVCDs to DivX. Ripped DVDs
@@ -196,7 +122,7 @@
     output.avi</CODE></P>
 
 
-<H4><A NAME="copying">2.4.2.3 Stream copying</A></H4>
+<H3><A NAME="copying">2.4.3 Stream copying</A></H3>
 
 <P>MEncoder can handle input streams in two ways: <B>encode</B> or
   <B>copy</B> them. This section is about <B>copying</B>.</P>
@@ -217,7 +143,7 @@
 </UL>
 
 
-<H4><A NAME="fixing">2.4.2.4 Fixing AVIs with broken index or interleaving</A></H4>
+<H3><A NAME="fixing">2.4.4 Fixing AVIs with broken index or interleaving</A></H3>
 
 <P>Easiest thing. We simply copy the video and audio streams, and
   MEncoder generates the index. Of course this cannot fix possible bugs
@@ -228,7 +154,7 @@
 <P>Command: <CODE>mencoder -idx input.avi -ovc copy -oac copy -o output.avi</CODE></P>
 
 
-<H4><A NAME="libavcodec">2.4.2.5 Encoding with the libavcodec codec family</A></H4>
+<H3><A NAME="libavcodec">2.4.5 Encoding with the libavcodec codec family</A></H3>
 
 <P><A HREF="codecs.html#libavcodec">libavcodec</A> provides simple encoding to a
   lot of interesting video and audio formats (currently its audio codecs are
@@ -253,7 +179,7 @@
     -lavcopts vcodec=mjpeg -oac copy</CODE></P>
 
 
-<H4><A NAME="image_files">2.4.2.6 Encoding from multiple input image files (JPEGs, PNGs or TGAs)</A></H4>
+<H3><A NAME="image_files">2.4.6 Encoding from multiple input image files (JPEGs, PNGs or TGAs)</A></H3>
 
 <P>MEncoder is capable of creating movies from one or more JPEG, PNG or TGA
   files. With simple framecopy it can create MJPEG (Motion JPEG), MPNG
@@ -301,7 +227,7 @@
   -oac copy -o output.avi</CODE></P>
 
 
-<H4><A NAME="vobsub">2.4.2.7 Extracting DVD subtitles to Vobsub file</A></H4>
+<H3><A NAME="vobsub">2.4.7 Extracting DVD subtitles to a Vobsub file</A></H3>
 
 <P>MEncoder is capable of extracting subtitles from a DVD into
   Vobsub fomat files. They consist of a pair of files ending in
@@ -342,10 +268,5 @@
     -vobsuboutindex 0 -vobsuboutid fr -sid 1</CODE></P>
 
 
-<H3><A NAME="options">2.4.3 Available options</A></H3>
-
-<P>For the complete list of available MEncoder options and examples,
-  please see the man page.</P>
-
 </BODY>
 </HTML>