Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 8964c2f8a2b4998a95b42d8cdc90b8d8e11d4d8c)
+++ multimedia/videoutils/ffmpeg.xml	(revision d7bee48efde6b53c4260d9677973e48d83832d6e)
@@ -7,11 +7,10 @@
   <!ENTITY ffmpeg-download-http "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.xz">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "0cff5dae51375f0a31a651f986ed1534">
-  <!ENTITY ffmpeg-size          "6.9 MB">
-  <!ENTITY ffmpeg-buildsize     "156 MB (additional 2450 MB for the FATE suite
-    and 2251 MB for the documentation, making a total of 4.8 GB for the complete
-    build of this page)">
-  <!ENTITY ffmpeg-time          "1.3 SBU, with -j4 (additional 3.1 SBU, with
-    THREADS=4, to run the FATE suite, after sample files are downloaded)">
+  <!ENTITY ffmpeg-md5sum        "beb5c69c671aba1386e7156fc2af1ab6">
+  <!ENTITY ffmpeg-size          "7.1 MB">
+  <!ENTITY ffmpeg-buildsize     "172 MB (add 1.6 GB for the FATE suite/tests
+    and 1.0 GB for the documentation)">
+  <!ENTITY ffmpeg-time          "5.3 SBU (add 0.6 SBU for docs and 4.5 SBU
+    to run the FATE suite after sample files are downloaded)">
 ]>
 
@@ -196,9 +195,9 @@
       Postscript versions of the documentation, issue the following commands:
     </para>
-
+<!--
 <screen><userinput>sed -i '$s/$/\n\n@bye/' doc/{git-howto,nut,fate}.texi             &amp;&amp;
 sed -i '/machine:i386/ s/\\/@backslashchar{}/g' doc/platform.texi &amp;&amp;
-
-pushd doc &amp;&amp;
+-->
+<screen><userinput>pushd doc &amp;&amp;
 for DOCNAME in `basename -s .html *.html`
 do
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision 8964c2f8a2b4998a95b42d8cdc90b8d8e11d4d8c)
+++ multimedia/videoutils/transcode.xml	(revision d7bee48efde6b53c4260d9677973e48d83832d6e)
@@ -79,5 +79,5 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg2-1.patch"/>
+          <ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg3-1.patch"/>
         </para>
       </listitem>
@@ -165,8 +165,5 @@
        $(find . -name Makefile.in -exec grep -l 'docsdir =' {} \;) &amp;&amp;
 
-sed -i "s:av_close_input_file:avformat_close_input:g" \
-       import/probe_ffmpeg.c                                       &amp;&amp;
-
-patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch                   &amp;&amp;
+patch -Np1 -i ../transcode-&transcode-version;-ffmpeg3-1.patch                   &amp;&amp;
 ./configure --prefix=/usr \
             --enable-alsa \
Index: multimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision 8964c2f8a2b4998a95b42d8cdc90b8d8e11d4d8c)
+++ multimedia/videoutils/vlc.xml	(revision d7bee48efde6b53c4260d9677973e48d83832d6e)
@@ -6,10 +6,9 @@
 
   <!ENTITY vlc-download-http "http://download.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
-      <!ENTITY vlc-download-ftp " ">
-<!--  <!ENTITY vlc-download-ftp "ftp://ftp.videolan.org/pub/videolan/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">-->
-  <!ENTITY vlc-md5sum        "f98d60f0f59ef72b6e3407f2ff09bda6">
-  <!ENTITY vlc-size          "22 MB">
-  <!ENTITY vlc-buildsize     "679 MB (with tests)">
-  <!ENTITY vlc-time          "4.4 SBU (with tests)">
+  <!ENTITY vlc-download-ftp " ">
+  <!ENTITY vlc-md5sum        "ecbc65be549e5cc83e4cbe0129e66dcd">
+  <!ENTITY vlc-size          "21 MB">
+  <!ENTITY vlc-buildsize     "603 MB (with tests)">
+  <!ENTITY vlc-time          "4.6 SBU (with tests)">
 ]>
 
@@ -72,4 +71,14 @@
         <para>
           Estimated build time: &vlc-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/vlc-&vlc-version;-ffmpeg3-1.patch"/>
         </para>
       </listitem>
@@ -212,6 +221,6 @@
 
     <para>
-      If both Qt4 and Qt5 are installed, Qt5 has to be hidden from
-      <envar>PKG_CONFIG_PATH</envar>, due to a bug. Temporarily do it, issuing:
+      If both Qt4 and Qt5 are installed, Qt5 needs to be hidden from
+      <envar>PKG_CONFIG_PATH</envar>, due to a bug. Temporarily do it by issuing:
     </para>
 
@@ -221,8 +230,7 @@
 
     <para>
-      If you wish to avoid thousands of annoying warnings, issue:
-    </para>
-
-<screen><userinput>sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac</userinput></screen>
+      If you wish to avoid many invalid warnings, issue:
+    </para>
+<screen><userinput>sed -i '/seems to be moved/s/^/#/' autotools/ltmain.sh</userinput></screen>
 
     <para>
@@ -230,29 +238,12 @@
     </para>
 
-<screen><userinput>sed -e 's:libsmbclient.h:samba-4.0/&amp;:' \
-    -i modules/access/smb.c &amp;&amp;
-
-sed -e '/LUA_C/ i #define LUA_COMPAT_APIINTCASTS' \
-    -i modules/lua/vlc.h    &amp;&amp;
-
-sed -e '/core.h/ {
-        a #include &lt;opencv2/imgproc/imgproc_c.h&gt;
-        a #include &lt;opencv2/imgproc/imgproc.hpp&gt;
-    }' \
-    -i modules/video_filter/opencv_example.cpp &amp;&amp;
-
-./bootstrap &amp;&amp;
-
+<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-ffmpeg3-1.patch &amp;&amp;
+
+CXX="g++ -std=c++11"             \
+CFLAGS="-DLUA_COMPAT_5_1"        \
 OPENCV_LIBS="-L/usr/share/OpenCV" \
 ./configure --prefix=/usr &amp;&amp;
 
-sed -e '/seems to be moved/s/^/#/' \
-    -i autotools/ltmain.sh libtool &amp;&amp;</userinput></screen>
-
-    <para>
-      In order to build with Lua 5.1 compatiblity, issue:
-    </para>
-
-<screen><userinput>CFLAGS='-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_1' make </userinput></screen>
+make</userinput></screen>
 
     <para>
@@ -292,17 +283,11 @@
 
     <para>
-      <command>sed -i ...</command>: This sed fixes compilation with
-      <application>Samba</application> 4.
-    </para>
-
-    <para>
-      <command>sed -e ... -i modules/lua/vlc.h</command> This sed fixes
-      compilation with <application>lua</application> 5.3.
-    </para>
-
-    <para>
-      <command>sed -e ... -i modules/video_filter/opencv_example.cpp</command>
-      This sed partially fixes compilation with
-      <application>OpenCV</application> 3.
+      <envar>CXX="g++ -std=c++11"</envar>: This environment variable
+      is needed for compatibility with <xref linkend="gcc"/>.
+    </para>
+
+    <para>
+      <envar>CFLAGS="-DLUA_COMPAT_5_1"</envar>: This environment variable
+      is needed for compatibility with <xref linkend="lua"/>.
     </para>
 
@@ -314,15 +299,4 @@
 
     <para>
-      <command>./bootstrap</command>: This command calls autoreconf to generate
-      m4 macros and prepare Makefiles.
-    </para>
-
-    <para>
-      <command>sed -e ... -i.orig autotools/ltmain.sh libtool</command>: This
-      optional sed removes a lot of invalid build warnings.
-      If desired, remove it.
-    </para>
-
-    <para>
       <option>--enable-opencv=no</option>: This switch disables
       <application>OpenCV</application> suport.
@@ -363,23 +337,4 @@
       have <application>libgcrypt</application> installed.
     </para>
-
-<!--
-    <para>
-      <option>- -enable-shine</option>: Use this option if you wish to build the
-      <application>Shine</application> plugin.
-    </para>
-
-    <para>
-      <option>- -enable-tremor</option>: Use this option if you have
-      <application>Tremor</application> installed and wish to build the
-      <application>Tremor</application> plugin.
-    </para>
-
-    <para>
-      <option>- -enable-aa</option>: Use this option if you have
-      <application>AAlib</application> installed and wish to build the
-      <application>AAlib</application> plugin.
-    </para>
--->
 
     <note>
@@ -406,5 +361,5 @@
         </seg>
         <seg>
-          libvlccore.so, libvlc.so and several plugins in
+          libvlccore.so, libvlc.so and many plugins in
           /usr/lib/vlc/plugins
         </seg>
