Index: general.ent
===================================================================
--- general.ent	(revision a5c54e025af3b1dba8ad34b168766d7e50bff521)
+++ general.ent	(revision 4fc73869b5ab8300cec36b801ca8771af2adaa2a)
@@ -817,5 +817,5 @@
 
 <!-- Chapter 40 -->
-<!ENTITY ffmpeg-version               "2.0">
+<!ENTITY ffmpeg-version               "1.2.1">
 <!ENTITY mplayer-version              "1.1.1">
 <!ENTITY xine-ui-version              "0.99.7">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a5c54e025af3b1dba8ad34b168766d7e50bff521)
+++ introduction/welcome/changelog.xml	(revision 4fc73869b5ab8300cec36b801ca8771af2adaa2a)
@@ -54,7 +54,4 @@
         </listitem>
         <listitem>
-          <para>[igor] - FFmpeg-2.0.</para>
-        </listitem>
-        <listitem>
           <para>[ken] - Fixed SoundTouch for recent Automake.</para>
         </listitem>
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision a5c54e025af3b1dba8ad34b168766d7e50bff521)
+++ multimedia/videoutils/ffmpeg.xml	(revision 4fc73869b5ab8300cec36b801ca8771af2adaa2a)
@@ -8,8 +8,8 @@
            "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "13a0feb74474f89052f6b8ba1bce46be">
-  <!ENTITY ffmpeg-size          "6.0 MB">
+  <!ENTITY ffmpeg-md5sum        "5071a26cc149f380908ce79ec2a677ef">
+  <!ENTITY ffmpeg-size          "5.7 MB">
   <!ENTITY ffmpeg-buildsize     "100 MB">
-  <!ENTITY ffmpeg-time          "2.6 SBU">
+  <!ENTITY ffmpeg-time          "4.0 SBU">
 ]>
 
@@ -87,9 +87,9 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="alsa-lib"/>,
       <xref linkend="faac"/>,
       <xref linkend="freetype2"/>,
       <xref linkend="lame"/>,
       <xref linkend="openjpeg"/>,
+      <xref linkend="pulseaudio"/>,
       <xref linkend="speex"/>,
       <xref linkend="libtheora"/>,
@@ -106,7 +106,6 @@
     <para role="optional">
       <xref linkend="fontconfig"/>,
+      <ulink url="http://www.piksel.org/frei0r">frei0r</ulink>,
       <xref linkend="gnutls"/>,
-      <xref linkend="pulseaudio"/>,
-      <ulink url="http://www.piksel.org/frei0r">frei0r</ulink>,
       <ulink url="http://tipok.org.ua/node/17">libaacplus</ulink>,
       <ulink url="http://code.google.com/p/libass/">libass</ulink>,
@@ -134,6 +133,5 @@
       <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>,
       <ulink url="http://xavs.sourceforge.net/">libxavs</ulink> (SVN checkout),
-      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>,
-      <ulink url="http://www.khronos.org/opencl/">OpenCL</ulink>, and
+      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>, and
       <ulink url="http://www.nongnu.org/texi2html">texi2html</ulink> (to build HTML documentation)
     </para>
@@ -190,4 +188,5 @@
             --enable-libmp3lame  \
             --enable-libopenjpeg \
+            --enable-libpulse    \
             --enable-libspeex    \
             --enable-libtheora   \
@@ -276,91 +275,4 @@
 
     <para>
-      <parameter>--enable-gpl</parameter>: Enables the use of GPL code and
-      permits support for postprocessing, swscale and many other features.
-    </para>
-
-    <para>
-      <parameter>--enable-version3</parameter>: Enables the use of (L)GPL
-      version 3 code.
-    </para>
-
-    <para>
-      <parameter>--enable-nonfree</parameter>: Enables the use of nonfree
-      code. Note that the resulting libraries and binaries will be
-      unredistributable.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--enable-shared</parameter>: Enables building shared libraries,
-      otherwise only static libraries are built and installed.
-    </para>
-
-    <para>
-      <parameter>--enable-x11grab</parameter>: Enables X11 grabbing.
-    </para>
-
-    <para>
-      <parameter>--enable-libfaac</parameter>: Enables AAC encoding via
-      <filename class="libraryfile">libfaac</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libfreetype</parameter>: Enables the use of
-      <filename class="libraryfile">libfreetype</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libmp3lame</parameter>: Enables MP3 encoding via
-      <filename class="libraryfile">libmp3lame</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libopenjpeg</parameter>: Enables JPEG 2000 de/encoding
-      via <filename class="libraryfile">libopenjpeg</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libspeex</parameter>: Enables
-      <application>Speex</application> de/encoding
-      via <filename class="libraryfile">libspeex</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libtheora</parameter>: Enables
-      <application>Theora</application> encoding
-      via <filename class="libraryfile">libtheora</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libvorbis</parameter>: Enables
-      <application>Vorbis</application> de/encoding
-      via <filename class="libraryfile">libvorbis</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libvpx</parameter>: Enables VP8 de/encoding
-      via <filename class="libraryfile">libvpx</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libxvid</parameter>: Enables
-      <application>Xvid</application> encoding
-      via <filename class="libraryfile">libxvidcore</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-openssl</parameter>: Enables
-      <application>OpenSSL</application> cryptography.
-    </para>
-
-    <para>
-      <parameter>--disable-debug</parameter>: Disables building debugging
-      symbols into the programs and libraries.
-    </para>
-
-    <para>
       <command>gcc tools/qt-faststart.c -o tools/qt-faststart</command>:
       This builds the <command>qt-faststart</command> program which can
@@ -370,4 +282,97 @@
       is located at the beginning of the file instead of the end. This allows
       the movie file to begin playing before the entire file has been downloaded.
+    </para>
+
+    <para>
+      <parameter>--enable-gpl</parameter>: Enables the use of GPL code and
+      permits support for postprocessing, swscale and many other features.
+    </para>
+
+    <para>
+      <parameter>--enable-version3</parameter>: Enables the use of (L)GPL
+      version 3 code.
+    </para>
+
+    <para>
+      <parameter>--enable-nonfree</parameter>: Enables the use of nonfree
+      code. Note that the resulting libraries and binaries will be
+      unredistributable.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <parameter>--enable-shared</parameter>: Enables building shared libraries,
+      otherwise only static libraries are built and installed.
+    </para>
+
+    <para>
+      <parameter>--enable-x11grab</parameter>: Enables X11 grabbing.
+    </para>
+
+    <para>
+      <parameter>--enable-libfaac</parameter>: Enables AAC encoding via
+      <filename class="libraryfile">libfaac</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-libfreetype</parameter>: Enables the use of
+      <filename class="libraryfile">libfreetype</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-libmp3lame</parameter>: Enables MP3 encoding via
+      <filename class="libraryfile">libmp3lame</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-libopenjpeg</parameter>: Enables JPEG 2000 de/encoding
+      via <filename class="libraryfile">libopenjpeg</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-libpulse</parameter>: Enables
+      <application>Pulseaudio</application> input via
+      <filename class="libraryfile">libpulse</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-libspeex</parameter>: Enables
+      <application>Speex</application> de/encoding
+      via <filename class="libraryfile">libspeex</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-libtheora</parameter>: Enables
+      <application>Theora</application> encoding
+      via <filename class="libraryfile">libtheora</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-libvorbis</parameter>: Enables
+      <application>Vorbis</application> de/encoding
+      via <filename class="libraryfile">libvorbis</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-libvpx</parameter>: Enables VP8 de/encoding
+      via <filename class="libraryfile">libvpx</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-libxvid</parameter>: Enables
+      <application>Xvid</application> encoding
+      via <filename class="libraryfile">libxvidcore</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-openssl</parameter>: Enables
+      <application>OpenSSL</application> cryptography.
+    </para>
+
+    <para>
+      <parameter>--disable-debug</parameter>: Disables building debugging
+      symbols into the programs and libraries.
     </para>
 
