Index: general.ent
===================================================================
--- general.ent	(revision 7f2dfa09cc350abef45826644ff704e452870aaf)
+++ general.ent	(revision 89d37eb8fffd72fec214caf8778086a614f84bdf)
@@ -808,5 +808,5 @@
 
 <!-- Chapter 40 -->
-<!ENTITY ffmpeg-version               "1.2.2">
+<!ENTITY ffmpeg-version               "2.0.1">
 <!ENTITY mplayer-version              "1.1.1">
 <!ENTITY xine-ui-version              "0.99.7">
Index: general/graphlib/gegl.xml
===================================================================
--- general/graphlib/gegl.xml	(revision 7f2dfa09cc350abef45826644ff704e452870aaf)
+++ general/graphlib/gegl.xml	(revision 89d37eb8fffd72fec214caf8778086a614f84bdf)
@@ -68,4 +68,14 @@
         <para>
           Estimated build time: &gegl-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/gegl-&gegl-version;-ffmpeg2-1.patch"/>
         </para>
       </listitem>
@@ -119,6 +129,5 @@
     </para>
 
-<screen><userinput>sed -e '274cerr = avformat_open_input (&amp;p->ic, o->path, NULL, NULL);' \
-    -i operations/external/ff-load.c &amp;&amp;
+<screen><userinput>patch -Np1 -i ../gegl-&gegl-version;-ffmpeg2-1.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
@@ -141,9 +150,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e '274cerr ...</command>: Fixes building against
-      <application>FFMpeg</application> 0.11.1.
-    </para>
 
     <para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7f2dfa09cc350abef45826644ff704e452870aaf)
+++ introduction/welcome/changelog.xml	(revision 89d37eb8fffd72fec214caf8778086a614f84bdf)
@@ -48,4 +48,8 @@
       <itemizedlist>
         <listitem>
+          <para>[igor] - Update to ffmpeg-2.0.1. Fixes
+          <ulink url="&blfs-ticket-root;3953">#3953</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Added x264-20131007-2245.</para>
         </listitem>
Index: multimedia/cdwriteutils/k3b.xml
===================================================================
--- multimedia/cdwriteutils/k3b.xml	(revision 7f2dfa09cc350abef45826644ff704e452870aaf)
+++ multimedia/cdwriteutils/k3b.xml	(revision 89d37eb8fffd72fec214caf8778086a614f84bdf)
@@ -94,5 +94,5 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/k3b-&k3b-version;-ffmpeg_fix-2.patch"/>
+          <ulink url="&patch-root;/k3b-&k3b-version;-ffmpeg2-1.patch"/>
         </para>
       </listitem>
@@ -154,5 +154,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg_fix-2.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg2-1.patch &amp;&amp;
 
 mkdir build &amp;&amp;
Index: multimedia/libdriv/alsa-plugins.xml
===================================================================
--- multimedia/libdriv/alsa-plugins.xml	(revision 7f2dfa09cc350abef45826644ff704e452870aaf)
+++ multimedia/libdriv/alsa-plugins.xml	(revision 89d37eb8fffd72fec214caf8778086a614f84bdf)
@@ -71,4 +71,14 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/alsa-plugins-&alsa-plugins-version;-ffmpeg2-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">ALSA Plugins Dependencies</bridgehead>
 
@@ -100,5 +110,6 @@
     </para>
 
-<screen><userinput>./configure &amp;&amp;
+<screen><userinput>patch -Np1 -i ../alsa-plugins-&alsa-plugins-version;-ffmpeg2-1.patch &amp;&amp;
+./configure &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/libquicktime.xml
===================================================================
--- multimedia/libdriv/libquicktime.xml	(revision 7f2dfa09cc350abef45826644ff704e452870aaf)
+++ multimedia/libdriv/libquicktime.xml	(revision 89d37eb8fffd72fec214caf8778086a614f84bdf)
@@ -72,4 +72,14 @@
         <para>
           Estimated build time: &libquicktime-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/libquicktime-&libquicktime-version;-ffmpeg2-1.patch"/>
         </para>
       </listitem>
@@ -109,5 +119,6 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr     \
+<screen><userinput>patch -Np1 -i ../libquicktime-&libquicktime-version;-ffmpeg2-1.patch &amp;&amp;
+./configure --prefix=/usr     \
             --enable-gpl      \
             --without-doxygen \
Index: multimedia/libdriv/opal.xml
===================================================================
--- multimedia/libdriv/opal.xml	(revision 7f2dfa09cc350abef45826644ff704e452870aaf)
+++ multimedia/libdriv/opal.xml	(revision 89d37eb8fffd72fec214caf8778086a614f84bdf)
@@ -77,5 +77,5 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/opal-&opal-version;-ffmpeg-1.patch"/>
+          <ulink url="&patch-root;/opal-&opal-version;-ffmpeg2-1.patch"/>
         </para>
       </listitem>
@@ -114,5 +114,5 @@
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg2-1.patch &amp;&amp;
 
 ./configure --prefix=/usr &amp;&amp;
Index: multimedia/libdriv/opus.xml
===================================================================
--- multimedia/libdriv/opus.xml	(revision 7f2dfa09cc350abef45826644ff704e452870aaf)
+++ multimedia/libdriv/opus.xml	(revision 89d37eb8fffd72fec214caf8778086a614f84bdf)
@@ -142,5 +142,5 @@
         <listitem>
           <para>
-            provides the functions used to read and write opus format.
+            provides the functions used to read and write Opus format.
           </para>
           <indexterm zone="opus libopus">
Index: multimedia/libdriv/x264.xml
===================================================================
--- multimedia/libdriv/x264.xml	(revision 7f2dfa09cc350abef45826644ff704e452870aaf)
+++ multimedia/libdriv/x264.xml	(revision 89d37eb8fffd72fec214caf8778086a614f84bdf)
@@ -112,7 +112,4 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
     <para>
       <parameter>--disable-cli</parameter>: This switch disables building the
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 7f2dfa09cc350abef45826644ff704e452870aaf)
+++ multimedia/videoutils/ffmpeg.xml	(revision 89d37eb8fffd72fec214caf8778086a614f84bdf)
@@ -8,8 +8,8 @@
            "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "4997660dfc077922e37d0583f9322f6b">
-  <!ENTITY ffmpeg-size          "5.7 MB">
+  <!ENTITY ffmpeg-md5sum        "dd71a1baedb2daa3e4d21e0651daa918">
+  <!ENTITY ffmpeg-size          "6.0 MB">
   <!ENTITY ffmpeg-buildsize     "100 MB">
-  <!ENTITY ffmpeg-time          "4.0 SBU">
+  <!ENTITY ffmpeg-time          "2.6 SBU">
 ]>
 
@@ -81,40 +81,39 @@
     <bridgehead renderas="sect3">FFmpeg Dependencies</bridgehead>
 
-    <!-- All dependencies are listed in the order as they are displayed in
-         the configure script. This makes it easy for readers (and editors)
-         to match up the dependency list with what is required or desired. -->
-
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="yasm"/>,
+      <xref linkend="libass"/>,
+      <xref linkend="fdk-aac"/>,
+      <xref linkend="lame"/>,
+      <xref linkend="opus"/>,
+      <xref linkend="libtheora"/>,
+      <xref linkend="libvorbis"/>,
+      <xref linkend="libvpx"/>, and
+      <xref linkend="x264"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended for desktop use</bridgehead>
+    <para>
+      <xref linkend="x-window-system"/>,
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="sdl"/>,
+      <xref linkend="libva"/> and
+      <xref linkend="libvdpau"/> (with the corresponding driver package)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
       <xref linkend="faac"/>,
       <xref linkend="freetype2"/>,
-      <xref linkend="lame"/>,
       <xref linkend="openjpeg"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="speex"/>,
-      <xref linkend="libtheora"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="libvpx"/>,
       <xref linkend="xvid"/>,
       <xref linkend="openssl"/>,
-      <xref linkend="sdl"/>,
-      <xref linkend="xorg7-lib"/>,
-      <xref linkend="yasm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (For Hardware Video Decoding)</bridgehead>
-    <para>
-      <xref linkend="libva"/> and
-      <xref linkend="libvdpau"/>
-      (with the corresponding driver package)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
       <xref linkend="fontconfig"/>,
       <ulink url="http://www.piksel.org/frei0r">frei0r</ulink>,
       <xref linkend="gnutls"/>,
       <ulink url="http://tipok.org.ua/node/17">libaacplus</ulink>,
-      <xref linkend="libass"/>,
       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
       <ulink url="http://caca.zoy.org/">libcaca</ulink>,
@@ -122,5 +121,4 @@
       <ulink url="http://ftp.gnu.org/pub/gnu/libcdio/">libcdio</ulink>,
       <ulink url="http://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
-      <xref linkend="fdk-aac"/>,
       <ulink url="http://www.speech.cs.cmu.edu/flite/">Flite</ulink>,
       <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
@@ -131,5 +129,4 @@
       <ulink url="http://sourceforge.net/projects/opencore-amr">OpenCore AMR</ulink>,
       <ulink url="http://opencv.org/">OpenCV</ulink>,
-      <xref linkend="opus"/>,
       <ulink url="http://sourceforge.net/projects/librtmp">librtmp</ulink>,
       <ulink url="http://diracvideo.org/">Schroedinger</ulink>,
@@ -138,5 +135,4 @@
       <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">vo-aaenc</ulink>,
       <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">vo-amrwbenc</ulink>,
-      <xref linkend="x264"/>,
       <ulink url="http://xavs.sourceforge.net/">libxavs</ulink> (SVN checkout),
       <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>, and
@@ -164,8 +160,4 @@
       commands:
     </para>
-
-    <!-- The confiure optinos are listed in the order as they are displayed in
-         the configure script. This makes it easy for readers (and editors)
-         to match up the options with what is required or desired. -->
 
 <screen><userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &amp;&amp;
@@ -176,17 +168,14 @@
             --disable-static     \
             --enable-shared      \
-            --enable-x11grab     \
-            --enable-libfaac     \
-            --enable-libfreetype \
+            --disable-debug      \
+            --enable-libass      \
+            --enable-libfdk-aac  \
             --enable-libmp3lame  \
-            --enable-libopenjpeg \
-            --enable-libpulse    \
-            --enable-libspeex    \
+            --enable-libopus     \
             --enable-libtheora   \
             --enable-libvorbis   \
             --enable-libvpx      \
-            --enable-libxvid     \
-            --enable-openssl     \
-            --disable-debug      &amp;&amp;
+            --enable-libx264     \
+            --enable-x11grab     &amp;&amp;
 make &amp;&amp;
 gcc tools/qt-faststart.c -o tools/qt-faststart &amp;&amp;
@@ -302,15 +291,16 @@
 
     <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>.
+      <parameter>--disable-debug</parameter>: Disables building debugging
+      symbols into the programs and libraries.
+    </para>
+
+    <para>
+      <parameter>--enable-libass</parameter>: Enables ASS/SSA subtitle format
+      rendering <filename class="libraryfile">libass</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-libfdk-aac</parameter>: Enables audio encoding in AAC
+      format via <filename class="libraryfile">libfdk-aac</filename>.
     </para>
 
@@ -321,18 +311,6 @@
 
     <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>.
+      <parameter>--enable-libopus</parameter>: Enables Opus format encoding and
+      decoding via <filename class="libraryfile">libopus</filename>.
     </para>
 
@@ -355,30 +333,23 @@
 
     <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>
-      <option>--enable-<replaceable>&lt;codec&gt;</replaceable></option>:
-      <application>FFmpeg</application> comes with code to compile decoders for
-      almost every codec you could think of. The only reason to enable a
-      specific codec (and make <application>FFmpeg</application> link to the
-      prerequisite shared library installed on your system) is to make
+      <parameter>--enable-libx264</parameter>: Enables H.264 de/encoding
+      via <filename class="libraryfile">libvpx</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-x11grab</parameter>: Enables X11 grabbing.
+    </para>
+
+    <para>
+      Support for most of the dependency packages requires using options passed
+      to the <command>configure</command> script. View the the output from
+      <command>./configure --help</command> for complete information about
+      enabling dependency packages. The only reason to enable a specific codec
+      (and make <application>FFmpeg</application> link to the prerequisite
+      shared library installed on your system) is to make
       <application>FFmpeg</application> compile an <emphasis>encoder</emphasis>
-      for that codec. <application>FFmpeg</application> provides an excellent
-      collection of decoders. If you just want to use
-      <application>FFmpeg</application> to watch video or listen to music (via
-      other applications such as <application>Gstreamer</application> or
+      and/or <emphasis>decoder</emphasis> for that codec. If you just want to
+      use <application>FFmpeg</application> to watch video or listen to music
+      (via other applications such as <application>Gstreamer</application> or
       <application>Xine</application>) then you will not benefit from linking
       <application>FFmpeg</application> to other codec libraries.
@@ -426,5 +397,5 @@
       <seglistitem>
         <seg>
-          ffmpeg, ffplay, ffprobe, ffserver and
+          ffmpeg, ffplay, ffprobe, ffserver, and
           qt-faststart
         </seg>
@@ -432,5 +403,5 @@
           libavcodec.so, libavdevice.so, libavfilter.so,
           libavformat.so, libavutil.so, libpostproc.so,
-          libswresample and libswscale.so
+          libswresample, and libswscale.so
         </seg>
         <seg>
@@ -443,5 +414,5 @@
           /usr/include/libswresample
           /usr/include/libswscale,
-          /usr/share/ffmpeg and
+          /usr/share/ffmpeg, and
           /usr/share/doc/ffmpeg-&ffmpeg-version;
         </seg>
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision 7f2dfa09cc350abef45826644ff704e452870aaf)
+++ multimedia/videoutils/transcode.xml	(revision 89d37eb8fffd72fec214caf8778086a614f84bdf)
@@ -79,5 +79,5 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg-2.patch"/>
+          <ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg2-1.patch"/>
         </para>
       </listitem>
@@ -156,5 +156,5 @@
 <screen><userinput>sed -i 's|doc/transcode|&amp;-$(PACKAGE_VERSION)|' \
        $(find . -name Makefile.in -exec grep -l 'docsdir =' {} \;) &amp;&amp;
-patch -Np1 -i ../transcode-&transcode-version;-ffmpeg-2.patch &amp;&amp;
+patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch &amp;&amp;
 ./configure --prefix=/usr \
             --enable-alsa \
