Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e71e78e018e5156574d1bb88e6333ed625473737)
+++ introduction/welcome/changelog.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
@@ -10,4 +10,7 @@
 
 <itemizedlist>
+
+<listitem><para>December 21st, 2002 [larry]: Multimedia: Added
+ffmpeg-211202-cvs.</para></listitem>
 
 <listitem><para>December 21st, 2002 [larry]: Multimedia: Added
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision e71e78e018e5156574d1bb88e6333ed625473737)
+++ introduction/welcome/credits.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
@@ -77,5 +77,5 @@
 <itemizedlist>
 
-<listitem><para>aalib, Alsa, opendivx and xvid: <emphasis>Alex Kloss</emphasis></para></listitem>
+<listitem><para>aalib, Alsa, ffmpeg, opendivx and xvid: <emphasis>Alex Kloss</emphasis></para></listitem>
 
 <listitem><para>AbiWord, at-spi, ATK, audiofile, avifile, bc, bonobo-activation, bug-buddy,
Index: multimedia/multimedia.ent
===================================================================
--- multimedia/multimedia.ent	(revision e71e78e018e5156574d1bb88e6333ed625473737)
+++ multimedia/multimedia.ent	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
@@ -35,4 +35,5 @@
 <!ENTITY % xvid SYSTEM "videoutils/xvid/xvid.ent">
 <!ENTITY % opendivx SYSTEM "videoutils/opendivx/opendivx.ent">
+<!ENTITY % ffmpeg SYSTEM "videoutils/ffmpeg/ffmpeg.ent">
 <!ENTITY % avifile SYSTEM "videoutils/avifile/avifile.ent">
 <!ENTITY % mplayer SYSTEM "videoutils/mplayer/mplayer.ent">
@@ -41,4 +42,5 @@
 %xvid;
 %opendivx;
+%ffmpeg;
 %avifile;
 %mplayer;
Index: multimedia/videoutils/avifile/avifile-intro.xml
===================================================================
--- multimedia/videoutils/avifile/avifile-intro.xml	(revision e71e78e018e5156574d1bb88e6333ed625473737)
+++ multimedia/videoutils/avifile/avifile-intro.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
@@ -18,5 +18,5 @@
 linkend="SDL"/>
 avifile will utilize:
-<xref linkend="qt"/>, oss <xref linkend="opendivx"/> and <xref linkend="xvid"/></screen>
+<xref linkend="qt"/>, oss, <xref linkend="ffmpeg"/>,  <xref linkend="opendivx"/> and <xref linkend="xvid"/></screen>
 
 </sect2>
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
+++ multimedia/videoutils/ffmpeg.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
@@ -0,0 +1,11 @@
+<sect1 id="ffmpeg" xreflabel="ffmpeg-&ffmpeg-version;">
+<?dbhtml filename="ffmpeg.html" dir="multimedia"?>
+<title>ffmpeg-&ffmpeg-version;</title>
+
+&ffmpeg-intro;
+&ffmpeg-inst;
+&ffmpeg-config;
+&ffmpeg-desc;
+
+</sect1>
+
Index: multimedia/videoutils/ffmpeg/ffmpeg-config.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-config.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
+++ multimedia/videoutils/ffmpeg/ffmpeg-config.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Configuring ffmpeg</title>
+
+<sect3><title>Config files</title>
+
+<para><userinput>~/.ffmpeg/ffserver-config</userinput></para>
+
+<para>You'll find a sample ffserver configuration file 
+<ulink url="http://ffmpeg.sourceforge.net/sample.html">here</ulink></para>
+
+</sect3>
+
+</sect2>
+
Index: multimedia/videoutils/ffmpeg/ffmpeg-desc.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-desc.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
+++ multimedia/videoutils/ffmpeg/ffmpeg-desc.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
@@ -0,0 +1,27 @@
+<sect2>
+<title>Contents</title>
+
+<para>The ffmpeg package contains <userinput>ffmpeg</userinput>,
+<userinput>ffserver</userinput>, <userinput>libavcodec</userinput> and 
+<userinput>libavformat</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ffmpeg</title>
+<para>ffmpeg is a command line tool to convert video files, network streams,
+input from a TV card to several video formats.</para></sect3>
+
+<sect3><title>ffserver</title>
+<para>ffserver is a streaming server for everything that ffmpeg could use
+as input (files, streams, TV card input, webcam, etc.).</para></sect3>
+
+<sect3><title>libavcodec/libavformat</title>
+<para>libavcodec and libavformats are libraries for encoding/decoding
+video streams and putting them into files or network packets. Since
+they're well documented, you can easily include them in your software,
+like some other packages already do.</para></sect3>
+
+</sect2>
+
Index: multimedia/videoutils/ffmpeg/ffmpeg-inst.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-inst.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
+++ multimedia/videoutils/ffmpeg/ffmpeg-inst.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of ffmpeg</title>
+
+<para>Install ffmpeg by running the following commands:</para>
+
+<para><screen><userinput>unset CFLAGS &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: multimedia/videoutils/ffmpeg/ffmpeg-intro.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-intro.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
+++ multimedia/videoutils/ffmpeg/ffmpeg-intro.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Introduction to ffmpeg</title>
+
+<screen>Download location (HTTP):       <ulink url="&ffmpeg-download-http;"/>
+Version used:                   &ffmpeg-version;
+Package size:                   &ffmpeg-size;
+Estimated Disk space required:  &ffmpeg-buildsize;</screen>
+
+<para>You may want to check out the source from CVS yourself:</para>
+<para><screen><userinput>cvs -d:pserver:anonymous@cvs.ffmpeg.sourceforge.net:/cvsroot/ffmpeg login &amp;&amp;
+cvs -z9 -d:pserver:anonymous@cvs.ffmpeg.sourceforge.net:/cvsroot/ffmpeg co ffmpeg</userinput></screen></para>
+
+<para>ffmpeg is a solution to record, convert and stream audio and
+video. Due to heavy development, not all of this functions will work.  </para>
+
+<screen>ffmpeg will utilize:
+<xref linkend="libvorbis"/>, <xref linkend="lame"/>, and Imlib2</screen>
+
+</sect2>
Index: multimedia/videoutils/ffmpeg/ffmpeg.ent
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg.ent	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
+++ multimedia/videoutils/ffmpeg/ffmpeg.ent	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
@@ -0,0 +1,10 @@
+<!ENTITY ffmpeg SYSTEM "../ffmpeg.xml">
+<!ENTITY ffmpeg-intro SYSTEM "ffmpeg-intro.xml">
+<!ENTITY ffmpeg-inst SYSTEM "ffmpeg-inst.xml">
+<!ENTITY ffmpeg-exp SYSTEM "ffmpeg-exp.xml">
+<!ENTITY ffmpeg-desc SYSTEM "ffmpeg-desc.xml">
+<!ENTITY ffmpeg-config SYSTEM "ffmpeg-config.xml">
+<!ENTITY ffmpeg-buildsize "3.2 MB">
+<!ENTITY ffmpeg-version "211202-cvs">
+<!ENTITY ffmpeg-download-http "http://www.tinkerland.org.uk/cvs-snapshots/current/">
+<!ENTITY ffmpeg-size "700 kB">
Index: multimedia/videoutils/mplayer/mplayer-intro.xml
===================================================================
--- multimedia/videoutils/mplayer/mplayer-intro.xml	(revision e71e78e018e5156574d1bb88e6333ed625473737)
+++ multimedia/videoutils/mplayer/mplayer-intro.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
@@ -22,5 +22,5 @@
 linkend="libpng"/>, <xref linkend="libjpeg"/>, <xref
 linkend="libungif"/>, <xref linkend="aalib"/>, <xref linkend="SDL"/>,
-<xref linkend="xvid"/>, <xref linkend="opendivx"/>, oss, <xref linkend="arts"/>, <xref linkend="alsa"/> and <xref linkend="libogg"/></screen>
+<xref linkend="ffmpeg"/>, <xref linkend="xvid"/>, <xref linkend="opendivx"/>, oss, <xref linkend="arts"/>, <xref linkend="alsa"/> and <xref linkend="libogg"/></screen>
 
 </sect2>
Index: multimedia/videoutils/videoutils.xml
===================================================================
--- multimedia/videoutils/videoutils.xml	(revision e71e78e018e5156574d1bb88e6333ed625473737)
+++ multimedia/videoutils/videoutils.xml	(revision 49e5372d0f4758f74f8411f5023763125463e7d6)
@@ -5,4 +5,5 @@
 &xvid;
 &opendivx;
+&ffmpeg;
 &avifile;
 &mplayer;
