[FFmpeg-cvslog] [ffmpeg-web] branch master updated. af10c06 web/legal: remove Legal threats section

ffmpeg-cvslog at ffmpeg.org ffmpeg-cvslog at ffmpeg.org
Fri Oct 23 01:48:45 CEST 2015


The branch, master has been updated
       via  af10c065181fcda91a5d82d000320898801928cd (commit)
      from  95ca99b3daa66dbb4e3484878d4df43fe8eed965 (commit)


- Log -----------------------------------------------------------------
commit af10c065181fcda91a5d82d000320898801928cd
Author:     Lou Logan <lou at lrcd.com>
AuthorDate: Thu Oct 22 15:16:50 2015 -0800
Commit:     Lou Logan <lou at lrcd.com>
CommitDate: Thu Oct 22 15:39:39 2015 -0800

    web/legal: remove Legal threats section
    
    Signed-off-by: Lou Logan <lou at lrcd.com>
    Signed-off-by: Kieran Kunhya <kierank at obe.tv>
    Signed-off-by: wm4 <nfxjfg at googlemail.com>
    Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

diff --git a/src/legal b/src/legal
index c235d31..1037a69 100644
--- a/src/legal
+++ b/src/legal
@@ -157,14 +157,3 @@ you start trying to make money from patented technologies, the owners of
 the patents will come after their licensing fees. Notably, MPEG LA is
 vigilant and diligent about collecting for MPEG-related technologies.
 </p>
-
-<h1>Legal threats</h1>
-
-<a id="legal_threat"></a><h3>May 30, 2011</h3>
-<p>
-Today FFmpeg has received the <a href="threat1.png">first legal threat</a> in its existence. Its
-from a previous root admin of FFmpeg, who now is root admin of the
-Libav fork of FFmpeg. He claims copyright on the zigzag part of our
-logo. It has to be noted that he said 4 years ago <a href="http://article.gmane.org/gmane.comp.video.ffmpeg.devel/44742"><cite>Credit to whoever came up with the zigzag idea</cite></a></p>
-<p><i>Update May 31/June 1:</i> we have replaced the logo with a better looking one drawn by
-Hervé Flores.</p>

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

Summary of changes:
 src/legal | 11 -----------
 1 file changed, 11 deletions(-)


hooks/post-receive
-- 



More information about the ffmpeg-cvslog mailing list