From 5a2fd537d2c1914fe55508a8f71292c45c83d1d8 Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Thu, 21 Nov 2013 17:29:34 +0000
Subject: [PATCH] Update to ffmpeg-2.1.1.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12265 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml |  4 ++++
 multimedia/videoutils/ffmpeg.xml   | 29 +++++++++++------------------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/general.ent b/general.ent
index 0d12af1b34..2c4724366c 100644
--- a/general.ent
+++ b/general.ent
@@ -815,7 +815,7 @@ export -f as_root</userinput></screen>
 <!ENTITY pnmixer-version              "0.5.1">
 
 <!-- Chapter 40 -->
-<!ENTITY ffmpeg-version               "2.1">
+<!ENTITY ffmpeg-version               "2.1.1">
 <!ENTITY mplayer-version              "1.1.1">
 <!ENTITY xine-ui-version              "0.99.7">
 <!ENTITY transcode-version            "1.1.7">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 098626d659..3dadcc1a05 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,10 @@
     <listitem>
       <para>November 21st, 2013</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to ffmpeg-2.1.1. Fixes
+          <ulink url="&blfs-ticket-root;4356">#4356</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[igor] - Update to krb5-1.11.4. Fixes
           <ulink url="&blfs-ticket-root;4344">#4344</ulink>.</para>
diff --git a/multimedia/videoutils/ffmpeg.xml b/multimedia/videoutils/ffmpeg.xml
index 0974d52420..173b7728f3 100644
--- a/multimedia/videoutils/ffmpeg.xml
+++ b/multimedia/videoutils/ffmpeg.xml
@@ -7,10 +7,12 @@
   <!ENTITY ffmpeg-download-http
            "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "4ec1cedd4c7753512462f70b347c338a">
+  <!ENTITY ffmpeg-md5sum        "2719ab2b3311ac3775b9cdeb66c54849">
   <!ENTITY ffmpeg-size          "6.4 MB">
-  <!ENTITY ffmpeg-buildsize     "106 MB (additional 710 MB for docs)">
-  <!ENTITY ffmpeg-time          "2.4 SBU (additional 0.6 SBU for docs)">
+  <!ENTITY ffmpeg-buildsize     "114 MB (additional 710 MB for docs and 1.5 GB
+                                 for tests)">
+  <!ENTITY ffmpeg-time          "3.1 SBU (additional 0.6 SBU for docs 12.3 to
+                                 run the tests, after test files are downloaded)">
 ]>
 
 <sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
@@ -78,16 +80,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/ffmpeg-&ffmpeg-version;-libavformat_cookies-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">FFmpeg Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -173,8 +165,7 @@
       commands:
     </para>
 
-<screen><userinput>patch -Np1 -i ../ffmpeg-&ffmpeg-version;-libavformat_cookies-1.patch &amp;&amp;
-sed -i 's/-lflite"/-lflite -lasound"/' configure &amp;&amp;
+<screen><userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &amp;&amp;
 ./configure --prefix=/usr        \
             --enable-gpl         \
             --enable-version3    \
@@ -218,7 +209,7 @@ unset DOCNAME</userinput></screen>
 
     <para>
       If you have <xref linkend="doxygen"/> installed and wish to create the API
-      documentation (takes about 300 MB of space), issue the command
+      documentation (takes about 350 MB of space), issue the command
       <command>doxygen doc/Doxyfile</command>.
     </para>
 
@@ -226,8 +217,10 @@ unset DOCNAME</userinput></screen>
       To properly test the installation you must have <xref linkend="rsync"/>
       installed and follow the instructions for the
       <ulink url="http://ffmpeg.org/fate.html">
-      FFmpeg Automated Testing Environment</ulink>. Note that the BLFS team has
-      not performed this regression testing.
+      FFmpeg Automated Testing Environment</ulink> (fate). First, files used
+      for the tests are downloaded, this can take about 30 min, depending on
+      the connection speeds. Estimated values in "Package Information" do not
+      include this download time. Next, the tests are executed.
     </para>
 
     <para>