Index: general.ent
===================================================================
--- general.ent	(revision b9178ccfa359f4071fa0fea5c94bfc980999cc03)
+++ general.ent	(revision ba1ccf62235f66fd1eee53d609c26e7e60104a20)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "05">                   <!-- Always 2 digits -->
+<!ENTITY day          "06">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 5th, &year;">
+<!ENTITY releasedate  "May 6th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -131,5 +131,6 @@
 <!ENTITY gcc-490                        "gcc-4.9.0">
 
-
+<!ENTITY gcc6_checked           "<para>This package is known to build 
+                                properly using the gcc-6 compiler.</para>">
 
 <!ENTITY % package-entities SYSTEM      "packages.ent">
Index: general/genlib/ptlib.xml
===================================================================
--- general/genlib/ptlib.xml	(revision b9178ccfa359f4071fa0fea5c94bfc980999cc03)
+++ general/genlib/ptlib.xml	(revision ba1ccf62235f66fd1eee53d609c26e7e60104a20)
@@ -78,5 +78,5 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/ptlib-&ptlib-version;-bison_fixes-1.patch"/>
+          <ulink url="&patch-root;/ptlib-&ptlib-version;-bison_fixes-2.patch"/>
         </para>
       </listitem>
@@ -117,5 +117,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../ptlib-&ptlib-version;-bison_fixes-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../ptlib-&ptlib-version;-bison_fixes-2.patch &amp;&amp;
 
 ./configure --prefix=/usr &amp;&amp;
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision b9178ccfa359f4071fa0fea5c94bfc980999cc03)
+++ introduction/welcome/changelog.xml	(revision ba1ccf62235f66fd1eee53d609c26e7e60104a20)
@@ -45,4 +45,19 @@
 -->
     <listitem>
+      <para>May 6th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Added ENTITY gcc8_checked to aid 
+          transition to gcc-6.1.0.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to ffmpeg-3.0.2. Required updates to
+          ptlib, libquicktime, opal, xine-lib, and transcode.  Fixes
+          <ulink url="&blfs-ticket-root;7470">#7470</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 5th, 2016</para>
       <itemizedlist>
Index: multimedia/libdriv/libquicktime.xml
===================================================================
--- multimedia/libdriv/libquicktime.xml	(revision b9178ccfa359f4071fa0fea5c94bfc980999cc03)
+++ multimedia/libdriv/libquicktime.xml	(revision ba1ccf62235f66fd1eee53d609c26e7e60104a20)
@@ -81,5 +81,5 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/libquicktime-&libquicktime-version;-ffmpeg2-1.patch"/>
+          <ulink url="&patch-root;/libquicktime-&libquicktime-version;-ffmpeg3-1.patch"/>
         </para>
       </listitem>
@@ -119,5 +119,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../libquicktime-&libquicktime-version;-ffmpeg2-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../libquicktime-&libquicktime-version;-ffmpeg3-1.patch &amp;&amp;
 
 ./configure --prefix=/usr     \
Index: multimedia/libdriv/opal.xml
===================================================================
--- multimedia/libdriv/opal.xml	(revision b9178ccfa359f4071fa0fea5c94bfc980999cc03)
+++ multimedia/libdriv/opal.xml	(revision ba1ccf62235f66fd1eee53d609c26e7e60104a20)
@@ -116,6 +116,16 @@
 <screen><userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg2-1.patch &amp;&amp;
 
+sed -e 's/CODEC_ID/AV_&amp;/' \
+    -e 's/PIX_FMT_/AV_&amp;/' \
+    -i plugins/video/H.263-1998/h263-1998.cxx \
+       plugins/video/common/dyna.cxx          \
+       plugins/video/H.264/h264-x264.cxx      \
+       plugins/video/MPEG4-ffmpeg/mpeg4.cxx   &amp;&amp;
+
+ed -e '/&lt;&lt; mime.PrintContents/ s/mime/(const std::string\&amp;)&amp;/' \
+        -i src/im/msrp.cxx  &amp;&amp;
+
 ./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
+CXXFLAGS=-Wno-deprecated-declarations make</userinput></screen>
 
     <para>
@@ -129,4 +139,20 @@
 <screen role="root"><userinput>make install &amp;&amp;
 chmod -v 644 /usr/lib/libopal_s.a</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed ...</command>: The first sed fixes several files 
+      to work properly with <xref linkend='ffmpeg'/>.  The second fixes
+      a build issue with <xref linkend='gcc'/>.
+    </para>
+
+    <para>
+      <envar>CXXFLAGS=-Wno-deprecated-declarations</envar>: This parameter
+      reduces a lot of warnings generated by <xref linkend='gcc'/>.
+    </para>
 
   </sect2>
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision b9178ccfa359f4071fa0fea5c94bfc980999cc03)
+++ multimedia/libdriv/xine-lib.xml	(revision ba1ccf62235f66fd1eee53d609c26e7e60104a20)
@@ -125,5 +125,10 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr          \
+<screen><userinput>sed -e 's/avcodec_alloc_frame/av_frame_alloc/'            \
+        -e 's/avcodec_free_frame/av_frame_free/'          \
+        -i src/combined/ffmpeg/ff_{audio,video}_decoder.c \
+           src/dxr3/ffmpeg_encoder.c
+
+./configure --prefix=/usr          \
             --disable-vcd          \
             --with-external-dvdnav \
@@ -163,4 +168,13 @@
     <title>Command Explanations</title>
 
+    <para>
+      <command>sed ...</command>: This command enables the package to be 
+      built with <xref linkend='ffmpeg'/>.
+    </para>
+
+    <para>
+      <parameter>--with-external-dvdnav</parameter>: This switch is required,
+      because internal libraries cannot decrypt DVD.
+    </para>
     <para>
       <parameter>--disable-vcd</parameter>: This switch is required to compile
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision b9178ccfa359f4071fa0fea5c94bfc980999cc03)
+++ multimedia/videoutils/ffmpeg.xml	(revision ba1ccf62235f66fd1eee53d609c26e7e60104a20)
@@ -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)">
 ]>
 
@@ -197,8 +196,7 @@
     </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;
+<!-- 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; -->
+<screen><userinput>pushd doc &amp;&amp;
 for DOCNAME in `basename -s .html *.html`
 do
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision b9178ccfa359f4071fa0fea5c94bfc980999cc03)
+++ multimedia/videoutils/transcode.xml	(revision ba1ccf62235f66fd1eee53d609c26e7e60104a20)
@@ -39,4 +39,5 @@
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -79,5 +80,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 +166,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: packages.ent
===================================================================
--- packages.ent	(revision b9178ccfa359f4071fa0fea5c94bfc980999cc03)
+++ packages.ent	(revision ba1ccf62235f66fd1eee53d609c26e7e60104a20)
@@ -757,5 +757,5 @@
 
 <!-- Chapter 48 -->
-<!ENTITY ffmpeg-version               "2.8.6">
+<!ENTITY ffmpeg-version               "3.0.2">
 <!ENTITY mplayer-version              "SVN-r37794">
 <!ENTITY xine-ui-version              "0.99.9">
