Author: igor
Date: Sun Jul 14 08:51:05 2013
New Revision: 11407
Log:
Revert FFmpeg update
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/videoutils/ffmpeg.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Sun Jul 14 08:44:55 2013 (r11406)
+++ trunk/BOOK/general.ent Sun Jul 14 08:51:05 2013 (r11407)
@@ -816,7 +816,7 @@
<!ENTITY gvolwheel-version "1.0">
<!-- Chapter 40 -->
-<!ENTITY ffmpeg-version "2.0">
+<!ENTITY ffmpeg-version "1.2.1">
<!ENTITY mplayer-version "1.1.1">
<!ENTITY xine-ui-version "0.99.7">
<!ENTITY transcode-version "1.1.7">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sun Jul 14 08:44:55
2013 (r11406)
+++ trunk/BOOK/introduction/welcome/changelog.xml Sun Jul 14 08:51:05
2013 (r11407)
@@ -53,9 +53,6 @@
<para>[igor] - mpg123-1.15.4.</para>
</listitem>
<listitem>
- <para>[igor] - FFmpeg-2.0.</para>
- </listitem>
- <listitem>
<para>[ken] - Fixed SoundTouch for recent Automake.</para>
</listitem>
<listitem>
Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml Sun Jul 14 08:44:55 2013
(r11406)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml Sun Jul 14 08:51:05 2013
(r11407)
@@ -7,10 +7,10 @@
<!ENTITY ffmpeg-download-http
"http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2";>
<!ENTITY ffmpeg-download-ftp " ">
- <!ENTITY ffmpeg-md5sum "13a0feb74474f89052f6b8ba1bce46be">
- <!ENTITY ffmpeg-size "6.0 MB">
+ <!ENTITY ffmpeg-md5sum "5071a26cc149f380908ce79ec2a677ef">
+ <!ENTITY ffmpeg-size "5.7 MB">
<!ENTITY ffmpeg-buildsize "100 MB">
- <!ENTITY ffmpeg-time "2.6 SBU">
+ <!ENTITY ffmpeg-time "4.0 SBU">
]>
<sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
@@ -86,11 +86,11 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
- <xref linkend="alsa-lib"/>,
<xref linkend="faac"/>,
<xref linkend="freetype2"/>,
<xref linkend="lame"/>,
<xref linkend="openjpeg"/>,
+ <xref linkend="pulseaudio"/>,
<xref linkend="speex"/>,
<xref linkend="libtheora"/>,
<xref linkend="libvorbis"/>,
@@ -105,9 +105,8 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
<xref linkend="fontconfig"/>,
- <xref linkend="gnutls"/>,
- <xref linkend="pulseaudio"/>,
<ulink url="http://www.piksel.org/frei0r";>frei0r</ulink>,
+ <xref linkend="gnutls"/>,
<ulink url="http://tipok.org.ua/node/17";>libaacplus</ulink>,
<ulink url="http://code.google.com/p/libass/";>libass</ulink>,
<ulink
url="http://www.videolan.org/developers/libbluray.html";>libbluray</ulink>,
@@ -133,8 +132,7 @@
<ulink
url="http://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/";>vo-amrwbenc</ulink>,
<ulink url="http://www.videolan.org/developers/x264.html";>x264</ulink>,
<ulink url="http://xavs.sourceforge.net/";>libxavs</ulink> (SVN checkout),
- <ulink url="http://kcat.strangesoft.net/openal-releases/";>OpenAL</ulink>,
- <ulink url="http://www.khronos.org/opencl/";>OpenCL</ulink>, and
+ <ulink
url="http://kcat.strangesoft.net/openal-releases/";>OpenAL</ulink>, and
<ulink url="http://www.nongnu.org/texi2html";>texi2html</ulink> (to build
HTML documentation)
</para>
@@ -189,6 +187,7 @@
--enable-libfreetype \
--enable-libmp3lame \
--enable-libopenjpeg \
+ --enable-libpulse \
--enable-libspeex \
--enable-libtheora \
--enable-libvorbis \
@@ -275,6 +274,16 @@
</para>
<para>
+ <command>gcc tools/qt-faststart.c -o tools/qt-faststart</command>:
+ This builds the <command>qt-faststart</command> program which can
+ modify QuickTime formatted movies
+ (<filename class="extension">.mov</filename> or
+ <filename class="extension">.mp4</filename>) so that the header
information
+ is located at the beginning of the file instead of the end. This allows
+ the movie file to begin playing before the entire file has been
downloaded.
+ </para>
+
+ <para>
<parameter>--enable-gpl</parameter>: Enables the use of GPL code and
permits support for postprocessing, swscale and many other features.
</para>
@@ -323,6 +332,12 @@
</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>.
@@ -362,16 +377,6 @@
</para>
<para>
- <command>gcc tools/qt-faststart.c -o tools/qt-faststart</command>:
- This builds the <command>qt-faststart</command> program which can
- modify QuickTime formatted movies
- (<filename class="extension">.mov</filename> or
- <filename class="extension">.mp4</filename>) so that the header
information
- is located at the beginning of the file instead of the end. This allows
- the movie file to begin playing before the entire file has been
downloaded.
- </para>
-
- <para>
<option>--enable-<replaceable><codec></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
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
