[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 236e675 Remove ffserver from the about page.

[ffmpeg-git at ffmpeg.org]

The branch, master has been updated
       via  236e675aeda2350554b37e838e9c2b16c139270d (commit)
      from  edb87c912a85a4ea64228ea4d514931fb4dc5129 (commit)


- Log -----------------------------------------------------------------
commit 236e675aeda2350554b37e838e9c2b16c139270d
Author:     Carl Eugen Hoyos <ceffmpeg at gmail.com>
AuthorDate: Wed Jan 10 19:56:28 2018 +0100
Commit:     Carl Eugen Hoyos <ceffmpeg at gmail.com>
CommitDate: Wed Jan 10 19:56:28 2018 +0100

    Remove ffserver from the about page.

diff --git a/src/about b/src/about
index 67342a1..ccc2656 100644
--- a/src/about
+++ b/src/about
@@ -13,8 +13,8 @@
 
 <p class="info">It contains libavcodec, libavutil, libavformat, libavfilter, libavdevice,
   libswscale and libswresample which can be used by applications.
-  As well as ffmpeg, ffserver, ffplay and ffprobe which can be used by
-  end users for <strong>transcoding</strong>, <strong>streaming</strong> and <strong>playing</strong>.
+  As well as ffmpeg, ffplay and ffprobe which can be used by
+  end users for <strong>transcoding</strong> and <strong>playing</strong>.
 </p>
 
 <p class="with-icon">
@@ -59,14 +59,6 @@
         between formats</p>
     </a>
   </div>
-  <div class="col-md-6">
-    <a href="ffserver.html" class="well well-with-icon">
-      <span class="pull-left"><i class="fa fa-5x fa-fw fa-cloud"></i></span>
-      <h3><strong>ffserver</strong></h3>
-      <p>A multimedia <strong>streaming server</strong> for live
-        broadcasts</p>
-    </a>
-  </div>
 </div>
 <div class="row">
   <div class="col-md-6">

-----------------------------------------------------------------------

Summary of changes:
 src/about | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)


hooks/post-receive
--