Updated XviD CVS instructions by Dmitry Baryshkov <lumag@qnc.ru>.

libavcodec updates, correct spelling of XviD + small corrections.


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

3 files changed, 17 insertions, 15 deletions

diff --git a/DOCS/en/codecs.html b/DOCS/en/codecs.html
index 0e4b4005da..2d0f0041cd 100644
--- a/DOCS/en/codecs.html
+++ b/DOCS/en/codecs.html
@@ -260,12 +260,12 @@ MPlayer supports decoding all versions of RealVideo:
   have been tested) platforms.</B></P>
 
 
-<H4><A NAME="xvid">2.2.1.9 XViD</A></H4>
+<H4><A NAME="xvid">2.2.1.9 XviD</A></H4>
 
-<P><A HREF="http://www.xvid.org/"><B>XViD</B></A> is a forked development of
+<P><A HREF="http://www.xvid.org/"><B>XviD</B></A> is a forked development of
   the OpenDivX codec. It happened when ProjectMayo changed OpenDivX to closed
   source DivX4 (now DivX5), and the non-ProjectMayo people working on OpenDivX
-  got angry, then started XViD. So both projects have the same origin.</P>
+  got angry, then started XviD. So both projects have the same origin.</P>
 
 <H4>ADVANTAGES</H4>
 
@@ -282,27 +282,29 @@ MPlayer supports decoding all versions of RealVideo:
 <UL>
   <LI>currently it does not properly <B>decode</B> all DivX/DivX4 files (no 
     problem as <A HREF="#libavcodec">libavcodec</A> can play them)</LI>
-  <LI>you have to choose between DivX4 <B>or</B> XViD support at compiletime</LI>
+  <LI>you have to choose between DivX4 <B>or</B> XviD support at compiletime</LI>
   <LI>under development</LI>
 </UL>
 
 <H4>INSTALLING XVID CVS</H4>
 
-<P>XViD is currently available only from CVS. Here are the
-  download and installation instructions:</P>
+<P>XviD is currently available only from CVS. Here are download and installation
+  instructions (you need at least autoconf 2.50, automake and libtool):</P>
 
 <OL>
   <LI><CODE>cvs -z3 -d:pserver:anonymous@cvs.xvid.org:/xvid login</CODE></LI>
   <LI><CODE>cvs -z3 -d:pserver:anonymous@cvs.xvid.org:/xvid co xvidcore</CODE></LI>
   <LI><CODE>cd xvidcore/build/generic</CODE></LI>
-  <LI>Edit the Makefile for your architecture (probably
-    <CODE>Makefile.linuxx86</CODE>) to fit your needs.</LI>
-  <LI><CODE>make -f Makefile.linuxx86</CODE></LI>
-  <LI>Copy the <CODE>divx4.h</CODE> and <CODE>xvid.h</CODE> header files from
+  <LI><CODE>./bootstrap.sh</CODE></LI>
+  <LI><CODE>./configure</CODE><BR>
+    You may have to add some options (examine the output of
+    <CODE>./configure --help</CODE>).</LI>
+  <LI><CODE>make &amp;&amp; make install</CODE></LI>
+  <LI>If you specified <CODE>--enable-divxcompat</CODE>,
+    copy the <CODE>divx4.h</CODE> header file from
     <CODE>xvidcore/src/</CODE> to <CODE>/usr/local/include/</CODE>.</LI>
-  <LI>Get <CODE>encore2.h</CODE> and <CODE>decore.h</CODE> from the DivX4Linux
-    package, and copy them to <CODE>/usr/local/include/</CODE>.</LI>
-  <LI>Recompile MPlayer with <CODE>--with-xvidcore=/path/to/libxvidcore.a</CODE>.</LI>
+  <LI>Recompile MPlayer with
+    <CODE>--with-xvidcore=/path/to/libxvidcore.a</CODE>.</LI>
 </OL>
 
 
diff --git a/DOCS/en/documentation.html b/DOCS/en/documentation.html
index 4d57dfec1d..02ac7a1903 100644
--- a/DOCS/en/documentation.html
+++ b/DOCS/en/documentation.html
@@ -93,7 +93,7 @@
               <LI><A HREF="codecs.html#ms_video1">2.2.1.6 MS Video1</A></LI>
               <LI><A HREF="codecs.html#cinepak">2.2.1.7 Cinepak CVID</A></LI>
               <LI><A HREF="codecs.html#realvideo">2.2.1.8 RealVideo</A></LI>
-              <LI><A HREF="codecs.html#xvid">2.2.1.9 XViD</A></LI>
+              <LI><A HREF="codecs.html#xvid">2.2.1.9 XviD</A></LI>
               <LI><A HREF="codecs.html#sorenson">2.2.1.10 Sorenson</A></LI>
             </UL>
           </LI>
diff --git a/DOCS/en/encoding.html b/DOCS/en/encoding.html
index dfd8802e0e..3404d8ca12 100644
--- a/DOCS/en/encoding.html
+++ b/DOCS/en/encoding.html
@@ -210,7 +210,7 @@ Explanation of the process:
     <CODE>libjpeg</CODE> (when decoding PNGs, it will use <B>libpng</B>).</LI>
 
   <LI>MEncoder then feeds the decoded image to the chosen video compressor
-    (DivX4, Xvid, ffmpeg msmpeg4, etc...).</LI>
+    (DivX4, XviD, ffmpeg msmpeg4, etc...).</LI>
 </OL>
 
 <H4>Examples</H4>