Changeset baf1e23

Timestamp:

06/12/2012 03:35:06 PM (12 years ago)

Author:

Andrew Benton <andy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

68d9a97

Parents:

62662cb

Message:

ffmpeg-0.11.1

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10318 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/videoutils/ffmpeg.xml (modified) (9 diffs)

general.ent

@@ -1054 +1054 @@
 <!-- Chapter 40 -->
 <!ENTITY dvb-apps-version             "2012-06-10">
-<!ENTITY ffmpeg-version               "0.10.3">
+<!ENTITY ffmpeg-version               "0.11.1">
 <!-- <!ENTITY avifile-version              "0.7.45"> -->
 <!ENTITY mplayer-version              "1.1">

introduction/welcome/changelog.xml

@@ -82 +82 @@
           <para>[abenton] - Updated MPlayer to 1.1.</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - Updated FFmpeg to 0.11.1.</para>
+        </listitem>
       </itemizedlist>
     </listitem>

multimedia/videoutils/ffmpeg.xml

@@ -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 +74 @@
     <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 +128 @@
 
 <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 +159 @@
 <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 +186 @@
       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 +197 @@
     </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 +210 @@
       <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 +266 @@
           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 +428 @@
       </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>