From 103c407a64baf223c352b7d6512c9f4e61712e85 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Thu, 16 Apr 2009 12:15:57 +0000 Subject: [PATCH] Clarify license for VideoSink.cpp. hmm Haali, the VideoSink.cpp you have contributed to aegisub doesn't have a license attached... I see you put MatroskaParser.c into 3-clause BSD like the rest of aegisub though, what about VideoSink ? jfs: BSD license is ok for that file Originally committed to SVN as r2801. --- aegisub/src/VideoSink.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/aegisub/src/VideoSink.cpp b/aegisub/src/VideoSink.cpp index efc6742b4..3cf47b88e 100644 --- a/aegisub/src/VideoSink.cpp +++ b/aegisub/src/VideoSink.cpp @@ -1,5 +1,29 @@ /* * Copyright (c) 2004-2006 Mike Matsnev. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice immediately at the beginning of the file, without modification, + * this list of conditions, and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Absolutely no warranty of function or purpose is made by the author + * Mike Matsnev. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $Id: VideoSink.cpp,v 1.8 2007/01/17 23:40:51 mike Exp $ *