Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision faec3f7fcf25e84f0ba64cf20d86dd70ce7c3b6e)
+++ multimedia/videoutils/ffmpeg.xml	(revision baf1e230afcfb28a4d92c9209898a5dbd0e8e03f)
@@ -8,8 +8,8 @@
     "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "775d184933f71ff44a2fff4968e78b2b">
-  <!ENTITY ffmpeg-size          "5.6 MB">
-  <!ENTITY ffmpeg-buildsize     "244 MB">
-  <!ENTITY ffmpeg-time          "3.7 SBU">
+  <!ENTITY ffmpeg-md5sum        "ff8cb914f657e164dd60ea1008b555a8">
+  <!ENTITY ffmpeg-size          "5.8 MB">
+  <!ENTITY ffmpeg-buildsize     "256 MB">
+  <!ENTITY ffmpeg-time          "3.9 SBU">
 ]>
 
@@ -74,14 +74,14 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="faad2"/>, 
+      <xref linkend="faad2"/>,
       <xref linkend="lame"/>,
-      <xref linkend="libtheora"/>, 
+      <xref linkend="libtheora"/>,
       <xref linkend="libvorbis"/>,
-      <xref linkend="libvpx"/>, 
+      <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://sourceforge.net/projects/opencore-amr">OpenCore AMR</ulink>,
-      <xref linkend="faac"/>, 
+      <xref linkend="faac"/>,
       <xref linkend="freetype2"/>,
       <ulink url="http://libgsm.sourcearchive.com/">GSM</ulink>,
@@ -128,6 +128,7 @@
 
 <screen><userinput>mkdir build &amp;&amp;
-cd build &amp;&amp;
-../configure --prefix=/usr --enable-shared --disable-static --enable-gpl &amp;&amp;
+cd    build &amp;&amp;
+../configure --prefix=/usr --enable-gpl \
+       --enable-shared --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -158,5 +159,5 @@
 <screen role="root"><userinput>make install &amp;&amp;
 mkdir /usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
-cp ../doc/*.txt /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
+cp ../doc/*.html /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
 
     <para>
@@ -185,5 +186,10 @@
       files in a separate directory to the source files.
     </para>
-    
+
+    <para>
+      <option>--enable-gpl</option>: This switch enables the use of GPL code and
+      permits support for postprocessing, swscale and many other features.
+    </para>
+
     <para>
       <option>--enable-shared</option>: This switch is needed to build the
@@ -191,13 +197,6 @@
     </para>
 
-    <para>
-      <option>--disable-static</option>: This switch prevents the static
-      libraries from being built.
-    </para>
-
-    <para>
-      <option>--enable-gpl</option>: This switch enables the use of GPL code and
-      permits support for postprocessing, swscale and many other features.
-    </para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
     <para>
@@ -211,15 +210,10 @@
       <command>ffmpeg</command>, study the output of <command>configure
       --help</command>. Remember, the dependencies all install their own
-      encoders (that are often better than <application>FFmpeg</application>'s).
-      <application>FFmpeg</application> is an excellent collection of decoders.
-      If you just want to use <application>FFmpeg</application> to watch video
-      or listen to music (via other applications like
-      <application>Gstreamer</application>) then you will not benefit from
-      linking it to another library.
-    </para>
-
-    <para>
-      <option>--disable-yasm</option>: use this option if you've not installed
-      yasm and you want what configure describes as "a crippled build".
+      encoders (that may produce better results than
+      <application>FFmpeg</application>). <application>FFmpeg</application> is
+      an excellent collection of decoders. If you just want to use
+      <application>FFmpeg</application> to watch video or listen to music (via
+      other applications like <application>Gstreamer</application> or Xine) then
+      you will not benefit from linking FFmpeg to another library.
     </para>
   </sect2>
@@ -272,14 +266,16 @@
           libavformat.so,
           libavutil.so,
-          libpostproc.so and
+          libpostproc.so,
+          libswresample and
           libswscale.so
         </seg>
         <seg>
           /usr/include/libavcodec,
-          /usr/include/libavdevice, 
+          /usr/include/libavdevice,
           /usr/include/libavfilter,
           /usr/include/libavformat,
           /usr/include/libavutil,
-          /usr/include/postproc,
+          /usr/include/libpostproc,
+          /usr/include/libswresample
           /usr/include/libswscale,
           /usr/share/ffmpeg and
@@ -432,4 +428,17 @@
       </varlistentry>
 
+      <varlistentry id="libswresample">
+        <term><filename class="libraryfile">libswresample.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>FFmpeg</application> audio rescaling library,
+            it contains functions for converting audio sample formats.
+          </para>
+          <indexterm zone="ffmpeg libswresample">
+            <primary sortas="c-libswresample">libswresample.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libswscale">
         <term><filename class="libraryfile">libswscale.so</filename></term>
