From 76ed78a0fa06b6acfcf5d29e7f75a9faf9f86d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=BDivkovi=C4=87?= <igor@linuxfromscratch.org>
Date: Mon, 4 Nov 2013 10:40:07 +0000
Subject: [PATCH] update to ffmpeg-2.1

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

diff --git a/general.ent b/general.ent
index 7415e248c2..31d2a8f600 100644
--- a/general.ent
+++ b/general.ent
@@ -814,7 +814,7 @@ export -f as_root</userinput></screen>
 <!ENTITY pnmixer-version              "0.5.1">
 
 <!-- Chapter 40 -->
-<!ENTITY ffmpeg-version               "2.0.2">
+<!ENTITY ffmpeg-version               "2.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 4eefdad77a..968a7e9be5 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,10 @@
     <listitem>
       <para>November 4th, 2013</para>
       <itemizedlist>
+        <listitem>
+          <para>[igor] - Update to ffmpeg-2.1. Fixes
+          <ulink url="&blfs-ticket-root;4235">#4235</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[igor] - Update to x264-20131103-2245.</para>
         </listitem>
diff --git a/multimedia/videoutils/ffmpeg.xml b/multimedia/videoutils/ffmpeg.xml
index 4f23c7b550..7ff7def9f7 100644
--- a/multimedia/videoutils/ffmpeg.xml
+++ b/multimedia/videoutils/ffmpeg.xml
@@ -7,10 +7,10 @@
   <!ENTITY ffmpeg-download-http
            "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "6c5cfed204d8a108325d1fc439ab734a">
-  <!ENTITY ffmpeg-size          "6.0 MB">
-  <!ENTITY ffmpeg-buildsize     "100 MB">
-  <!ENTITY ffmpeg-time          "2.1 SBU">
+  <!ENTITY ffmpeg-md5sum        "4ec1cedd4c7753512462f70b347c338a">
+  <!ENTITY ffmpeg-size          "6.4 MB">
+  <!ENTITY ffmpeg-buildsize     "106 MB">
+  <!ENTITY ffmpeg-time          "2.4 SBU">
 ]>
 
 <sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
@@ -78,6 +78,16 @@
       </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>
@@ -114,6 +124,9 @@
       <xref linkend="fontconfig"/>,
       <ulink url="http://www.piksel.org/frei0r">frei0r</ulink>,
       <xref linkend="gnutls"/>,
+      <ulink url="http://www.ladspa.org/">LADSPA</ulink>,
+      <ulink url="http://www.libssh.org/">libssh</ulink>,
+      <ulink url="http://zapping.sourceforge.net/ZVBI/">ZVBI</ulink>,
       <ulink url="http://tipok.org.ua/node/17">libaacplus</ulink>,
       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
       <ulink url="http://caca.zoy.org/">libcaca</ulink>,
@@ -160,7 +173,8 @@
       commands:
     </para>
 
-<screen><userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &amp;&amp;
+<screen><userinput>patch -Np1 -i ../ffmpeg-&ffmpeg-version;-libavformat_cookies-1.patch &amp;&amp;
+sed -i 's/-lflite"/-lflite -lasound"/' configure &amp;&amp;
 ./configure --prefix=/usr        \
             --enable-gpl         \
             --enable-version3    \