Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 9e0555ca900eb905d793819232796581ec57e53b)
+++ multimedia/libdriv/libdriv.xml	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
@@ -29,4 +29,5 @@
 &libdv;
 &liba52;
+&xvid;
 
 </chapter>
Index: multimedia/libdriv/xvid.xml
===================================================================
--- multimedia/libdriv/xvid.xml	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
+++ multimedia/libdriv/xvid.xml	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
@@ -0,0 +1,11 @@
+<sect1 id="xvid" xreflabel="XviD-&xvid-version;">
+<?dbhtml filename="xvid.html" dir="multimedia"?>
+<title>XviD-&xvid-version;</title>
+
+&xvid-intro;
+&xvid-inst;
+&xvid-exp;
+&xvid-desc;
+
+</sect1>
+
Index: multimedia/libdriv/xvid/xvid-desc.xml
===================================================================
--- multimedia/libdriv/xvid/xvid-desc.xml	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
+++ multimedia/libdriv/xvid/xvid-desc.xml	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
@@ -0,0 +1,38 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>XviD</application> core package contains the <filename
+class="libraryfile">libxvidcore</filename> library and the
+appendant header files. The library itself provides functions to encode
+and decode most MPEG-4 video data.</para>
+
+<para>Following features of MPEG-4 are supported:</para>
+<para><emphasis>I, P Frame encoding</emphasis></para>
+<para>I-Frames are image frames, while P-Frames are Pattern Frames.
+Image Frames contain full images. P-Frames contain patterns of what changes in
+the image, thusly saving a lot of space.</para>
+<para><emphasis>PMVFast and EPZS with diamond a sqare pattern motion 
+estimation</emphasis></para>
+<para>Fast Motion detection that can refer a square or diamond
+shaped pattern to different directions.</para>
+<para><emphasis>inter4v mode</emphasis></para>
+<para>Fast interpolation ability.</para>
+<para><emphasis>fullpixel and halfpixel precision</emphasis></para>
+<para>Even halfpixel movements can be encoded. Better precision
+results in better compression at better quality.</para>
+<para><emphasis>both MPEG-4 and H263 quantizations</emphasis></para>
+<para>MPEG-4 is the standard DivX was derived from. H263 is a
+slightly changed subset of that standard made by Microsoft. Quantization
+means to map the quantity of color values to numbers.</para>
+<para><emphasis>custom quant matrices</emphasis></para>
+<para>The quantization can be done using custom matrices,
+possibly giving better results if the matrix is made to suit the video
+data. Every normal user should be fine with the default matrix that comes
+with <application>XviD</application>.</para>
+<para><emphasis>Adaptive quantization / Luminance masking</emphasis></para>
+<para>Qantization and Luminance masking are variant, depending
+on the input material, therefore providing better results on dark or very
+contrasting images.</para>
+
+</sect2>
+
Index: multimedia/libdriv/xvid/xvid-exp.xml
===================================================================
--- multimedia/libdriv/xvid/xvid-exp.xml	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
+++ multimedia/libdriv/xvid/xvid-exp.xml	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><command>cp ../../src/divx4.h /usr/include</command>: This
+command puts this header files in the header search path in order for 
+<application>Xine</application> and <application>MPlayer</application> to 
+locate this package.</para>
+
+</sect2>
+
+
Index: multimedia/libdriv/xvid/xvid-inst.xml
===================================================================
--- multimedia/libdriv/xvid/xvid-inst.xml	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
+++ multimedia/libdriv/xvid/xvid-inst.xml	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Installation of <application>XviD</application></title>
+
+<para>Install <application>XviD</application> by running the following commands:</para>
+
+<screen><userinput><command>cd build/generic &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make  &amp;&amp;
+make install &amp;&amp;
+cp ../../src/divx4.h /usr/include</command></userinput></screen>
+
+</sect2>
+
Index: multimedia/libdriv/xvid/xvid-intro.xml
===================================================================
--- multimedia/libdriv/xvid/xvid-intro.xml	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
+++ multimedia/libdriv/xvid/xvid-intro.xml	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
@@ -0,0 +1,22 @@
+<sect2>
+<title>Introduction to <application>XviD</application></title>
+
+<para><application>XviD</application> is a <acronym>MPEG</acronym>-4
+compliant video <acronym>CODEC</acronym>.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&xvid-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&xvid-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &xvid-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &xvid-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &xvid-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>XviD</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="NASM"/>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: multimedia/libdriv/xvid/xvid.ent
===================================================================
--- multimedia/libdriv/xvid/xvid.ent	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
+++ multimedia/libdriv/xvid/xvid.ent	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
@@ -0,0 +1,11 @@
+<!ENTITY xvid SYSTEM "../xvid.xml">
+<!ENTITY xvid-intro SYSTEM "xvid-intro.xml">
+<!ENTITY xvid-inst SYSTEM "xvid-inst.xml">
+<!ENTITY xvid-exp SYSTEM "xvid-exp.xml">
+<!ENTITY xvid-desc SYSTEM "xvid-desc.xml">
+<!ENTITY xvid-version "0.9.2">
+<!ENTITY xvid-download-http "http://files.xvid.org/downloads/xvidcore-&xvid-version;.tar.bz2">
+<!ENTITY xvid-download-ftp "ftp://ftp.yars.free.net/pub/software/unix/lib/xvidcore-&xvid-version;.tar.bz2">
+<!ENTITY xvid-size "486 KB">
+<!ENTITY xvid-buildsize "5.1 MB">
+<!ENTITY xvid-time "0.23 SBU">
Index: multimedia/multimedia.ent
===================================================================
--- multimedia/multimedia.ent	(revision 9e0555ca900eb905d793819232796581ec57e53b)
+++ multimedia/multimedia.ent	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
@@ -4,5 +4,4 @@
 <!ENTITY multimedia-libdriv SYSTEM "libdriv/libdriv.xml">
 <!ENTITY % alsa SYSTEM "libdriv/alsa/alsa.ent">
-<!-- <!ENTITY % arts SYSTEM "libdriv/arts/arts.ent"> -->
 <!ENTITY arts SYSTEM "libdriv/arts.xml">
 <!ENTITY % audiofile SYSTEM "libdriv/audiofile/audiofile.ent">
@@ -24,6 +23,6 @@
 <!ENTITY % libdv SYSTEM "libdriv/libdv/libdv.ent">
 <!ENTITY % liba52 SYSTEM "libdriv/liba52/liba52.ent">
+<!ENTITY % xvid SYSTEM "libdriv/xvid/xvid.ent">
 %alsa;
-<!-- %arts; -->
 %audiofile;
 %esound;
@@ -44,4 +43,5 @@
 %libdv;
 %liba52;
+%xvid;
 
 <!-- Audio utilities -->
@@ -60,5 +60,4 @@
 <!-- Video utilities -->
 <!ENTITY multimedia-videoutils SYSTEM "videoutils/videoutils.xml">
-<!ENTITY % xvid SYSTEM "videoutils/xvid/xvid.ent">
 <!ENTITY % opendivx SYSTEM "videoutils/opendivx/opendivx.ent">
 <!ENTITY % ffmpeg SYSTEM "videoutils/ffmpeg/ffmpeg.ent">
@@ -68,5 +67,4 @@
 <!ENTITY % xine SYSTEM "videoutils/xine/xine.ent">
 <!ENTITY % transcode SYSTEM "videoutils/transcode/transcode.ent">
-%xvid;
 %opendivx;
 %ffmpeg;
Index: multimedia/videoutils/videoutils.xml
===================================================================
--- multimedia/videoutils/videoutils.xml	(revision 9e0555ca900eb905d793819232796581ec57e53b)
+++ multimedia/videoutils/videoutils.xml	(revision 7d1142d83f3a80388b266463dde1d68b27766ff1)
@@ -10,5 +10,4 @@
 <acronym>CODEC</acronym> to install.</para>
 
-&xvid;
 <!-- &opendivx; -->
 &ffmpeg;
Index: ltimedia/videoutils/xvid.xml
===================================================================
--- multimedia/videoutils/xvid.xml	(revision 9e0555ca900eb905d793819232796581ec57e53b)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect1 id="xvid" xreflabel="XviD-&xvid-version;">
-<?dbhtml filename="xvid.html" dir="multimedia"?>
-<title>XviD-&xvid-version;</title>
-
-&xvid-intro;
-&xvid-inst;
-&xvid-exp;
-&xvid-desc;
-
-</sect1>
-
