Changeset 3cf61ed8


Ignore:
Timestamp:
10/06/2014 01:37:12 AM (10 years ago)
Author:
Christopher Gregory <cjg@…>
Branches:
kde5-14686, systemd-13485
Children:
333e8400
Parents:
b52520c
Message:

Merge ffmpeg update from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14509 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • multimedia/videoutils/ffmpeg.xml

    rb52520c r3cf61ed8  
    343343
    344344    <para>
    345       <parameter>--enable-libx264</parameter>: Enables high-quality H.264/MPEG-4
    346       AVC encoding via <filename class="libraryfile">libx264</filename>.
     345      <parameter>--enable-libx264</parameter>: Enables high-quality
     346      H.264/MPEG-4 AVC encoding via <filename
     347      class="libraryfile">libx264</filename>.
    347348    </para>
    348349
  • packages.ent

    rb52520c r3cf61ed8  
    687687
    688688<!-- Chapter 40 -->
    689 <!ENTITY ffmpeg-version               "2.4.1">
     689<!ENTITY ffmpeg-version               "2.4.2">
    690690<!ENTITY mplayer-version              "1.1.1">
    691691<!ENTITY xine-ui-version              "0.99.9">
Note: See TracChangeset for help on using the changeset viewer.