Author: andy
Date: 2012-06-12 09:35:06 -0600 (Tue, 12 Jun 2012)
New Revision: 10318
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/videoutils/ffmpeg.xml
Log:
ffmpeg-0.11.1
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-06-12 11:53:14 UTC (rev 10317)
+++ trunk/BOOK/general.ent 2012-06-12 15:35:06 UTC (rev 10318)
@@ -1053,7 +1053,7 @@
<!-- 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">
<!ENTITY xine-ui-version "0.99.6">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-06-12 11:53:14 UTC
(rev 10317)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-06-12 15:35:06 UTC
(rev 10318)
@@ -81,6 +81,9 @@
<listitem>
<para>[abenton] - Updated MPlayer to 1.1.</para>
</listitem>
+ <listitem>
+ <para>[abenton] - Updated FFmpeg to 0.11.1.</para>
+ </listitem>
</itemizedlist>
</listitem>
Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml 2012-06-12 11:53:14 UTC (rev
10317)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml 2012-06-12 15:35:06 UTC (rev
10318)
@@ -7,10 +7,10 @@
<!ENTITY ffmpeg-download-http
"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">
]>
<sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
@@ -73,16 +73,16 @@
<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>,
<ulink url="http://sourceforge.net/projects/libdc1394";>libdc1394</ulink>,
@@ -127,8 +127,9 @@
</para>
<screen><userinput>mkdir build &&
-cd build &&
-../configure --prefix=/usr --enable-shared --disable-static --enable-gpl
&&
+cd build &&
+../configure --prefix=/usr --enable-gpl \
+ --enable-shared --disable-static &&
make</userinput></screen>
<para>
@@ -157,7 +158,7 @@
<screen role="root"><userinput>make install &&
mkdir /usr/share/doc/ffmpeg-&ffmpeg-version; &&
-cp ../doc/*.txt /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
+cp ../doc/*.html /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
<para>
If you used <command>doxygen</command> to create the API documentation,
@@ -184,22 +185,20 @@
ensures that we compile the <application>FFmpeg</application> object
files in a separate directory to the source files.
</para>
-
- <para>
- <option>--enable-shared</option>: This switch is needed to build the
- shared libraries, otherwise only static libraries are built and
installed.
- </para>
<para>
- <option>--disable-static</option>: This switch prevents the static
- libraries from being built.
+ <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-gpl</option>: This switch enables the use of GPL code
and
- permits support for postprocessing, swscale and many other features.
+ <option>--enable-shared</option>: This switch is needed to build the
+ shared libraries, otherwise only static libraries are built and
installed.
</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
+
<para>
<option>--enable-<replaceable><codec></replaceable></option>:
<application>FFmpeg</application> comes with code to compile decoders for
@@ -210,18 +209,13 @@
a specialist job. If that is what you want to do with
<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.
+ 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>
-
- <para>
- <option>--disable-yasm</option>: use this option if you've not installed
- yasm and you want what configure describes as "a crippled build".
- </para>
</sect2>
<sect2 role="configuration">
@@ -271,16 +265,18 @@
libavfilter.so,
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
/usr/share/doc/ffmpeg-&ffmpeg-version;
@@ -431,6 +427,19 @@
</listitem>
</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>
<listitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
