Changes in multimedia/videoutils/ffmpeg.xml [7b2fed0f:bc228ec]

File:

• multimedia/videoutils/ffmpeg.xml (modified) (28 diffs)

multimedia/videoutils/ffmpeg.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY ffmpeg-download-http "https://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.xz">
+  <!ENTITY ffmpeg-download-http "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.xz">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "7b9d5b652d20e8c5405304ad72636d4a">
-  <!ENTITY ffmpeg-size          "9.2 MB">
-  <!ENTITY ffmpeg-buildsize     "176 MB (add 2.4 GB for the FATE suite/tests, add 1.4 GB for documentation)">
-  <!ENTITY ffmpeg-time          "1.3 SBU (using parallelism=4; add 3.6 SBU (with THREADS=4) to run the FATE suite after sample files are downloaded; add 0.7 SBU for doxygen docs)">
+  <!ENTITY ffmpeg-md5sum        "5d1956bb552e91dc3b8287db346d0d58">
+  <!ENTITY ffmpeg-size          "8.9 MB">
+  <!ENTITY ffmpeg-buildsize     "170 MB (add 3.7 GB for the FATE suite/tests, add 1.3 GB for doxygen docs)">
+  <!ENTITY ffmpeg-time          "1.3 SBU (using parallelism=4; add 3.8 SBU (with THREADS=4) to run the FATE suite after sample files are downloaded; add 1.1 SBU for doxygen docs)">
 ]>
 
@@ -17 +17 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41 +42 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -91 +92 @@
       <xref linkend="x264"/>,
       <xref linkend="x265"/>, and
-      <xref linkend="nasm"/> or <xref linkend="yasm"/>
+      <xref linkend="yasm"/>
     </para>
 
@@ -104 +105 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="doxygen"/>,
       <xref linkend="fontconfig"/>,
-      <xref linkend="fribidi"/>,
       <xref linkend="frei0r"/>,
       <xref linkend="libcdio"/> (to identify and play CDs),
@@ -115 +114 @@
       <xref linkend="gnutls"/>,
       <xref linkend="pulseaudio"/>,
-      <xref linkend="samba"/>,
       <xref linkend="speex"/>,
       <xref linkend="texlive"/>
@@ -130 +128 @@
       <ulink url="http://caca.zoy.org/">libcaca</ulink>,
       <ulink url="https://gitlab.xiph.org/xiph/celt">libcelt</ulink>,
-      <ulink url="https://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
+      <ulink url="http://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
       <ulink url="https://www.videolan.org/developers/libdca.html">libdca</ulink>,
       <ulink url="https://ieee1394.wiki.kernel.org/index.php/Libraries">libiec61883</ulink>,
       <ulink url="https://github.com/dekkers/libilbc">libilbc</ulink>,
-      <ulink url="https://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
+      <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
       <ulink url="https://github.com/Distrotech/libnut">libnut</ulink> (Git checkout),
       <ulink url="http://rtmpdump.mplayerhq.hu/">librtmp</ulink>,
       <ulink url="http://www.libssh.org/">libssh</ulink>,
       <!--<ulink url="http://xavs.sourceforge.net/">libxavs</ulink> (SVN checkout),-->
-      <ulink url="https://openal.org/">OpenAL</ulink>,
-      <ulink url="https://sourceforge.net/projects/opencore-amr">OpenCore AMR</ulink>,
+      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>,
+      <ulink url="http://sourceforge.net/projects/opencore-amr">OpenCore AMR</ulink>,
       <!--<ulink url="http://diracvideo.org/">Schroedinger</ulink>,-->
-      <ulink url="https://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
+      <ulink url="http://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
       <ulink url="http://www.twolame.org/">TwoLAME</ulink>,
-      <ulink url="https://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">vo-aaenc</ulink>,
-      <ulink url="https://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">vo-amrwbenc</ulink>, and
+      <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">vo-aaenc</ulink>,
+      <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">vo-amrwbenc</ulink>, and
       <!--<ulink url="http://www.videolan.org/developers/x265.html">x265 (H.265/MPEG-H HEVC)</ulink>, and-->
       <ulink url="http://zapping.sourceforge.net/ZVBI/">ZVBI</ulink>
@@ -183 +181 @@
             --enable-libx264     \
             --enable-libx265     \
-            --enable-openssl     \
             --docdir=/usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
 
@@ -310 +307 @@
 
     <para>
-      <command>find ... ;</command>: Fixes permissions of documentation files
+      <command>find ... ;</command>: Fix permissions of documentation files
       and directories.
     </para>
@@ -400 +397 @@
 
     <para>
-      <parameter>--enable-openssl</parameter>:
+      <option>--enable-openssl</option> or <option>--enable-gnutls</option>:
       Enables HTTPS protocol for network streams.
-    </para>
-
-    <para>
-      <option>--enable-gnutls</option>: Use this option instead of
-      <parameter>--enable-openssl</parameter>, if you want to use
-      <application>GnuTLS</application> instead of
-      <application>OpenSSL</application> for HTTPS protocol.
     </para>
 
@@ -443 +433 @@
   </sect2>
 
-<!-- ffserver has been removed
   <sect2 role="configuration">
     <title>Configuring FFmpeg</title>
@@ -451 +440 @@
 
       <para>
-         <filename>/etc/ffserver.conf</filename>
-         <filename>~/.ffmpeg/ffserver-config</filename>
+        <filename>/etc/ffserver.conf</filename> and
+        <filename>~/.ffmpeg/ffserver-config</filename>
       </para>
 
@@ -472 +461 @@
 
   </sect2>
-  -->
 
   <sect2 role="content">
@@ -484 +472 @@
       <seglistitem>
         <seg>
-          ffmpeg, ffplay, ffprobe, <!--ffserver,--> and qt-faststart
+          ffmpeg, ffplay, ffprobe, ffserver, and qt-faststart
         </seg>
         <seg>
           libavcodec.so, libavdevice.so, libavfilter.so,
-          libavformat.so, libavutil.so, libavresample.so, libpostproc.so,
+          libavformat.so, libavutil.so, libpostproc.so,
           libswresample.so, and libswscale.so
         </seg>
         <seg>
-          /usr/include/libav{codec,device,filter,format,resample,util},
+          /usr/include/libav{codec,device,filter,format,util},
           /usr/include/libpostproc,
           /usr/include/libsw{resample,scale},
@@ -511 +499 @@
           <para>
             is a command-line tool to convert video files, network streams and
-            input from a TV card to several video formats
+            input from a TV card to several video formats.
           </para>
           <indexterm zone="ffmpeg ffmpeg-prog">
@@ -524 +512 @@
           <para>
             is a very simple and portable media player using the
-            <filename>ffmpeg</filename> libraries and the SDL library
+            <filename>ffmpeg</filename> libraries and the SDL library.
           </para>
           <indexterm zone="ffmpeg ffplay">
@@ -537 +525 @@
           <para>
             gathers information from multimedia streams and prints it in a human
-            and machine-readable fashion
+            and machine-readable fashion.
           </para>
           <indexterm zone="ffmpeg ffprobe">
@@ -545 +533 @@
       </varlistentry>
 
-<!-- Not found in 4.3.2
       <varlistentry id="ffserver">
         <term><command>ffserver</command></term>
@@ -551 +538 @@
           <para>
             is a streaming server for everything that <command>ffmpeg</command>
-            could use as input (files, streams, TV card input, webcam, etc)
+            could use as input (files, streams, TV card input, webcam, etc).
           </para>
           <indexterm zone="ffmpeg ffserver">
@@ -558 +545 @@
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="qt-faststart">
         <term><command>qt-faststart</command></term>
         <listitem>
           <para>
-            moves the index file to the front of quicktime (mov/mp4) videos
+            moves the index file to the front of quicktime (mov/mp4) videos.
           </para>
           <indexterm zone="ffmpeg qt-faststart">
@@ -576 +563 @@
           <para>
             is a library containing the <application>FFmpeg</application> codecs
-            (both encoding and decoding)
+            (both encoding and decoding).
           </para>
           <indexterm zone="ffmpeg libavcodec">
@@ -588 +575 @@
         <listitem>
           <para>
-            is the <application>FFmpeg</application> device handling library
+            is the <application>FFmpeg</application> device handling library.
           </para>
           <indexterm zone="ffmpeg libavdevice">
@@ -601 +588 @@
           <para>
             is a library of filters that can alter video or audio between the
-            decoder and the encoder (or output)
+            decoder and the encoder (or output).
           </para>
           <indexterm zone="ffmpeg libavfilter">
@@ -615 +602 @@
             is a library containing the file formats handling (mux and demux
             code for several formats) used by <command>ffplay</command> as well
-            as allowing the generation of  audio or video streams
+            as allowing the generation of  audio or video streams.
           </para>
           <indexterm zone="ffmpeg libavformat">
@@ -623 +610 @@
       </varlistentry>
 
-      <varlistentry id="libavresample">
-        <term><filename class="libraryfile">libavresample.so</filename></term>
-        <listitem>
-          <para>
-            is a library containing functions for resampling audio and video.
-          </para>
-          <indexterm zone="ffmpeg libavresample">
-            <primary sortas="c-libavresample">libavresample</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libavutil">
         <term><filename class="libraryfile">libavutil.so</filename></term>
         <listitem>
           <para>
-            is the <application>FFmpeg</application> utility library
+            is the <application>FFmpeg</application> utility library.
           </para>
           <indexterm zone="ffmpeg libavutil">
@@ -651 +626 @@
         <listitem>
           <para>
-            is the <application>FFmpeg</application> post processing library
+            is the <application>FFmpeg</application> post processing library.
           </para>
           <indexterm zone="ffmpeg libpostproc">
@@ -664 +639 @@
           <para>
             is the <application>FFmpeg</application> audio rescaling library,
-            it contains functions for converting audio sample formats
+            it contains functions for converting audio sample formats.
           </para>
           <indexterm zone="ffmpeg libswresample">
@@ -676 +651 @@
         <listitem>
           <para>
-            is the <application>FFmpeg</application> image rescaling library
+            is the <application>FFmpeg</application> image rescaling library.
           </para>
           <indexterm zone="ffmpeg libswscale">