Author: cjg
Date: Sun Oct 5 18:37:12 2014
New Revision: 14509
Log:
Merge ffmpeg update from trunk.
Modified:
branches/systemd/multimedia/videoutils/ffmpeg.xml
branches/systemd/packages.ent
Modified: branches/systemd/multimedia/videoutils/ffmpeg.xml
==============================================================================
--- branches/systemd/multimedia/videoutils/ffmpeg.xml Sun Oct 5 18:32:06
2014 (r14508)
+++ branches/systemd/multimedia/videoutils/ffmpeg.xml Sun Oct 5 18:37:12
2014 (r14509)
@@ -342,8 +342,9 @@
</para>
<para>
- <parameter>--enable-libx264</parameter>: Enables high-quality
H.264/MPEG-4
- AVC encoding via <filename class="libraryfile">libx264</filename>.
+ <parameter>--enable-libx264</parameter>: Enables high-quality
+ H.264/MPEG-4 AVC encoding via <filename
+ class="libraryfile">libx264</filename>.
</para>
<para>
Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent Sun Oct 5 18:32:06 2014 (r14508)
+++ branches/systemd/packages.ent Sun Oct 5 18:37:12 2014 (r14509)
@@ -686,7 +686,7 @@
<!ENTITY pnmixer-version "0.5.1">
<!-- Chapter 40 -->
-<!ENTITY ffmpeg-version "2.4.1">
+<!ENTITY ffmpeg-version "2.4.2">
<!ENTITY mplayer-version "1.1.1">
<!ENTITY xine-ui-version "0.99.9">
<!ENTITY transcode-version "1.1.7">
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
