Changeset 050c538

Timestamp:

03/07/2023 07:18:13 PM (14 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.0, 12.1, kea, ken/TL2024, ken/tuningfonts, lazarus, lxqt, plabs/newcss, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

67bcdc2

Parents:

66c5842

Message:

Remove using the external ffmpeg from mplayer.

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/videoutils/mplayer.xml (modified) (3 diffs)

introduction/welcome/changelog.xml

@@ -43 +43 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Remove using the external ffmpeg from mplayer. Fixes
+          <ulink url="&blfs-ticket-root;17751">#17751</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[thomas] - Update to tigervnc-1.13.1. Fixes
           <ulink url="&blfs-ticket-root;17759">#17759</ulink>.</para>

multimedia/videoutils/mplayer.xml

@@ -148 +148 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="gtk2"/>, and
+      <!--<xref linkend="ffmpeg"/>,-->
+      <xref linkend="gtk2"/> and
       <xref linkend="libvdpau-va-gl"/>
     </para>
@@ -279 +279 @@
             --enable-dynamic-plugins      \
             --disable-libmpeg2-internal   \
-            --disable-ffmpeg_a            \
-            --enable-menu                 \
+<!--            - -disable-ffmpeg_a            \
+-->            --enable-menu                 \
             --enable-runtime-cpudetection \
             --enable-gui                  &amp;&amp;
@@ -377 +377 @@
     <para>
       <option>--disable-ffmpeg_a</option>: You can use this option if you have
-      installed <xref linkend="ffmpeg"/>. <!--MPlayer includes a copy of the FFmpeg
+      installed a version of ffmpeg prior to ffmpeg-6.0. This
+      version of MPlayer is incompatible with the latest version of ffmpeg.
+      MPlayer does include a copy of the FFmpeg
       source and without this option it will statically compile the included
-      version of FFmpeg into itself.--> Dynamically linking to a system installed
+      version of FFmpeg into itself. Dynamically linking to a system installed
       FFmpeg makes MPlayer and Mencoder about 9MB smaller. <!--If MPlayer exhibits
       unstable behavior linked to a system installed FFmpeg, try recompiling MPlayer