[Mplayer-cvslog] CVS: main/DOCS/en codecs.html,1.114,1.115 documentation.html,1.397,1.398 encoding.html,1.89,1.90

[Diego Biurrun CVS]

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

Modified Files:
	codecs.html documentation.html encoding.html 
Log Message:
Updated XviD CVS instructions by Dmitry Baryshkov <lumag at qnc.ru>.
libavcodec updates, correct spelling of XviD + small corrections.


Index: codecs.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/en/codecs.html,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- codecs.html	27 Feb 2003 14:01:18 -0000	1.114
+++ codecs.html	29 Mar 2003 01:24:16 -0000	1.115
@@ -260,12 +260,12 @@
   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 @@
 <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 at cvs.xvid.org:/xvid login</CODE></LI>
   <LI><CODE>cvs -z3 -d:pserver:anonymous at 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>
 
 

Index: documentation.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/en/documentation.html,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- documentation.html	22 Mar 2003 12:02:13 -0000	1.397
+++ documentation.html	29 Mar 2003 01:24:16 -0000	1.398
@@ -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>

Index: encoding.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/en/encoding.html,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- encoding.html	22 Mar 2003 12:02:13 -0000	1.89
+++ encoding.html	29 Mar 2003 01:24:16 -0000	1.90
@@ -210,7 +210,7 @@
     <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>