Index: general.ent
===================================================================
--- general.ent	(revision 35bf1ea20df802d3b5c1a49062c0eeb6b8f61d92)
+++ general.ent	(revision efcf979ac45be0c34cf571c1f2bfc7a0bd9be7df)
@@ -875,5 +875,5 @@
 
 <!-- Chapter 40 -->
-<!ENTITY ffmpeg-version               "0.8.6">
+<!ENTITY ffmpeg-version               "0.9">
 <!ENTITY avifile-version              "0.7.45">
 <!ENTITY mplayer-version              "1.0rc1">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 35bf1ea20df802d3b5c1a49062c0eeb6b8f61d92)
+++ introduction/welcome/changelog.xml	(revision efcf979ac45be0c34cf571c1f2bfc7a0bd9be7df)
@@ -46,4 +46,10 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to ffmpeg-0.9.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update Xine Libraries dependencies.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to lame-3.99.3</para>
         </listitem>
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision 35bf1ea20df802d3b5c1a49062c0eeb6b8f61d92)
+++ multimedia/libdriv/xine-lib.xml	(revision efcf979ac45be0c34cf571c1f2bfc7a0bd9be7df)
@@ -35,5 +35,5 @@
     speakers.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -63,5 +63,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="x-window-system"/> and at least one of:
+      <xref linkend="x-window-system"/>,
+      <xref linkend="ffmpeg"/>, and at least one of:
         <xref linkend="alsa"/>, 
         <xref linkend="esound"/>, 
@@ -76,19 +77,26 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="ffmpeg"/>, <xref linkend="flac"/>,
-    <xref linkend="libtheora"/>, <xref linkend="libvorbis"/>,
-    <xref linkend="sdl"/>, <xref linkend="speex"/>, <xref linkend="libfame"/>,
-    <xref linkend="libmng"/>, <xref linkend="gnome-vfs"/>,
-    <xref linkend="libmad"/> 
-    <xref linkend="samba3"/>, <xref linkend="imagemagick"/>,
-    <ulink url="http://www.directfb.org/">DirectFB</ulink>, <ulink
-    url="http://sourceforge.net/projects/dvd/">libdvdnav</ulink>, 
-    <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>,
-    <ulink
-    url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
-    <xref linkend="aalib"/>, <xref linkend="liba52"/>, libdts (now <ulink
-    url="http://www.videolan.org/developers/libdca.html">libdca</ulink>),
-    <ulink url="http://www.wavpack.com/">WavPack</ulink>, and
-    <ulink url="http://dxr3.sourceforge.net/">libdxr3</ulink>.</para>
+    <para role="optional">
+      <xref linkend="flac"/>,
+      <xref linkend="libtheora"/>, 
+      <xref linkend="libvorbis"/>,
+      <xref linkend="sdl"/>, 
+      <xref linkend="speex"/>, 
+      <xref linkend="libfame"/>,
+      <xref linkend="libmng"/>, 
+      <xref linkend="gnome-vfs"/>,
+      <xref linkend="libmad"/> 
+      <xref linkend="samba3"/>, 
+      <xref linkend="imagemagick"/>,
+      <ulink url="http://www.directfb.org/">DirectFB</ulink>, 
+      <ulink url="http://sourceforge.net/projects/dvd/">libdvdnav</ulink>, 
+      <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>,
+      <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
+      <xref linkend="aalib"/>, 
+      <xref linkend="liba52"/>, 
+      libdts (now <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>),
+      <ulink url="http://www.wavpack.com/">WavPack</ulink>, and
+      <ulink url="http://dxr3.sourceforge.net/">libdxr3</ulink>
+    </para>
 
     <para>If the following packages are not found on the system, versions
@@ -99,6 +107,5 @@
 
     <para>The following are needed to build the API documentation:
-    <ulink
-    url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink>
+    <ulink url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink>
     and <ulink url="http://www.xfig.org/">Transfig</ulink></para>
 
@@ -114,5 +121,8 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/xine-lib-&xine-lib-version; &amp;&amp;
+<screen><userinput>./configure --prefix=/usr          \
+            --with-external-ffmpeg \
+            --docdir=/usr/share/doc/xine-lib-&xine-lib-version; &amp;&amp;
+
 make</userinput></screen>
 
@@ -129,8 +139,8 @@
     <title>Command Explanations</title>
 
-    <!--<para><option>
-    sed -i 's/\(inline \)\(_x_is_fourcc\)/__\1int \2/' src/xine-engine/buffer.h
-    &amp;&amp;</option>: This command enables c++ programs to use the header,
-    for example in <xref linkend="kdemultimedia"/></para>-->
+    <para><option>--with-external-ffmpeg</option>:
+    The internal version of <application>ffmpeg</application> fails.
+    This switch forces the use of the external version.
+    </para>
 
     <para><option>--docdir=/usr/share/xine-lib-&xine-lib-version;</option>:
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 35bf1ea20df802d3b5c1a49062c0eeb6b8f61d92)
+++ multimedia/videoutils/ffmpeg.xml	(revision efcf979ac45be0c34cf571c1f2bfc7a0bd9be7df)
@@ -7,8 +7,8 @@
   <!ENTITY ffmpeg-download-http "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "b4ef1fa6506750569fdb64a0f0a646a8">
-  <!ENTITY ffmpeg-size          "4.3 MB">
-  <!ENTITY ffmpeg-buildsize     "178 MB (built with recommended dependency)">
-  <!ENTITY ffmpeg-time          "2.5 SBU">
+  <!ENTITY ffmpeg-md5sum        "795058de6fc432aa11271408273a0535">
+  <!ENTITY ffmpeg-size          "4.7 MB">
+  <!ENTITY ffmpeg-buildsize     "199 MB">
+  <!ENTITY ffmpeg-time          "3.2 SBU">
 ]>
 
@@ -72,32 +72,37 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="yasm"/></para>
+    <para role="recommended">
+      <xref linkend="yasm"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="faad2"/>, <xref linkend="lame"/>,
-    <xref linkend="libtheora"/>, <xref linkend="libvorbis"/>,
-    <xref linkend="libvpx"/>, <xref linkend="x-window-system"/>,
-    <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>
-    (x264 needs <ulink url="http://www.tortall.net/projects/yasm/">yasm</ulink>
-    unless you configure it with <literal>--disable-asm</literal>),
-    <xref linkend="xvid"/>,
-    <ulink url="http://www.penguin.cz/~utx/amr">AMR narrowband
-    (floating point)</ulink>,
-    <ulink url="http://www.penguin.cz/~utx/amr">AMR wideband</ulink>,
-    <xref linkend="faac"/>, <xref linkend="freetype2"/>,
-    <ulink url="http://libgsm.sourcearchive.com/">GSM</ulink>,
-    <xref linkend="liba52"/>,
-    <ulink url="http://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
-    <ulink url="http://svn.mplayerhq.hu/nut/src/trunk/">libnut</ulink>
-    (SVN checkout),
-    <ulink url="http://sourceforge.net/projects/librtmp">librtmp</ulink>,
-    <ulink url="http://diracvideo.org/">libschroedinger</ulink>,
-    <ulink url="http://medialibrary.sourceforge.net/">MediaLibrary</ulink>,
-    <ulink url="http://www.openjpeg.org">OpenJPEG</ulink>
-    (<application>FFmpeg</application> includes code for it's own jpeg2000
-    encoder and decoder which is enabled by default), <xref linkend="speex"/>,
-    <!-- <xref linkend="tetex"/>, --> <xref linkend="sdl"/> and
-    <ulink url="http://www.nongnu.org/texi2html">texi2html</ulink>
-    (to build HTML documentation).</para>
+    <para role="optional">
+      <xref linkend="faad2"/>, 
+      <xref linkend="lame"/>,
+      <xref linkend="libtheora"/>, 
+      <xref linkend="libvorbis"/>,
+      <xref linkend="libvpx"/>, 
+      <xref linkend="x-window-system"/>,
+      <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>
+      <xref linkend="xvid"/>,
+      <ulink url="http://www.penguin.cz/~utx/amr">AMR narrowband (floating point)</ulink>,
+      <ulink url="http://www.penguin.cz/~utx/amr">AMR wideband</ulink>,
+      <xref linkend="faac"/>, 
+      <xref linkend="freetype2"/>,
+      <ulink url="http://libgsm.sourcearchive.com/">GSM</ulink>,
+      <xref linkend="liba52"/>,
+      <ulink url="http://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
+      <ulink url="http://svn.mplayerhq.hu/nut/src/trunk/">libnut</ulink>
+         (SVN checkout),
+      <ulink url="http://sourceforge.net/projects/librtmp">librtmp</ulink>,
+      <ulink url="http://diracvideo.org/">libschroedinger</ulink>,
+      <ulink url="http://medialibrary.sourceforge.net/">MediaLibrary</ulink>,
+      <ulink url="http://www.openjpeg.org">OpenJPEG</ulink>
+        (<application>FFmpeg</application> includes code for it's own jpeg2000
+        encoder and decoder which is enabled by default), 
+      <xref linkend="speex"/>,
+      <xref linkend="sdl"/> and
+      <ulink url="http://www.nongnu.org/texi2html">texi2html</ulink>
+        (to build HTML documentation).</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -141,7 +146,5 @@
 make install-man &amp;&amp;
 mkdir /usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
-cp ../doc/*.txt /usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
-texi2html --version &amp;&gt; /dev/null &amp;&amp;
-cp doc/*.html /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
+cp ../doc/*.txt /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
 
     <para>If you used <command>doxygen</command> to create the API
