LEGAL: Add COPYING.BSD file
Reword the disclaimer at the top of COPYING.LGPL, as it sounds a bit awkward to me. Move the BSD-like license to the top of mpeg_player.cpp (it still points out that only parts of the file are under that license) because that's where COPYING.BSD tells the reader to look. svn-id: r51939
This commit is contained in:
Torbjörn Andersson
parent
5611507156
commit
b8b4b42577
3 changed files with 159 additions and 66 deletions
93
COPYING.BSD
Normal file
93
COPYING.BSD
Normal file
|
|
@ -0,0 +1,93 @@
|
||||||
|
NOTE: Only certain parts of the ScummVM project are under the BSD license.
|
||||||
|
The majority of the files are under the GNU GPL. See the headers of the
|
||||||
|
individual files to find out the exact license.
|
||||||
|
|
||||||
|
The term "BSD license" refers to any BSD-like license, as they are sometimes
|
||||||
|
hard to tell apart. No slight against other licenses is intended.
|
||||||
|
|
||||||
|
|
||||||
|
Parts of the Nintendo DS port use the following license:
|
||||||
|
|
||||||
|
Copyright (c) 2006 Michael "Chishm" Chisholm
|
||||||
|
|
||||||
|
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,
|
||||||
|
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. The name of the author may not be used to endorse or promote products
|
||||||
|
derived from this software without specific prior written permission.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
|
||||||
|
Parts of the MPEG decoder use the following license:
|
||||||
|
|
||||||
|
Copyright (c) 1995 The Regents of the University of California.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software and its
|
||||||
|
documentation for any purpose, without fee, and without written agreement is
|
||||||
|
hereby granted, provided that the above copyright notice and the following
|
||||||
|
two paragraphs appear in all copies of this software.
|
||||||
|
|
||||||
|
IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
|
||||||
|
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
|
||||||
|
OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
|
||||||
|
CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
|
||||||
|
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||||
|
AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
|
||||||
|
ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
|
||||||
|
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
||||||
|
|
||||||
|
Copyright (c) 1995 Erik Corry
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software and its
|
||||||
|
documentation for any purpose, without fee, and without written agreement is
|
||||||
|
hereby granted, provided that the above copyright notice and the following
|
||||||
|
two paragraphs appear in all copies of this software.
|
||||||
|
|
||||||
|
IN NO EVENT SHALL ERIK CORRY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
|
||||||
|
SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
|
||||||
|
THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ERIK CORRY HAS BEEN ADVISED
|
||||||
|
OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
ERIK CORRY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
|
||||||
|
BASIS, AND ERIK CORRY HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
|
||||||
|
UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
||||||
|
|
||||||
|
Portions of this software Copyright (c) 1995 Brown University.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software and its
|
||||||
|
documentation for any purpose, without fee, and without written agreement
|
||||||
|
is hereby granted, provided that the above copyright notice and the
|
||||||
|
following two paragraphs appear in all copies of this software.
|
||||||
|
|
||||||
|
IN NO EVENT SHALL BROWN UNIVERSITY BE LIABLE TO ANY PARTY FOR
|
||||||
|
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
|
||||||
|
OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF BROWN
|
||||||
|
UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
BROWN UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
|
||||||
|
BASIS, AND BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
|
||||||
|
SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
NOTE: Only several files of ScummVM project are under GNU LGPL.
|
NOTE: Only certain parts of the ScummVM project are under the GNU LGPL.
|
||||||
Majority of files are under GNU GPL. See headers of individual
|
The majority of the files are under the GNU GPL. See the headers of the
|
||||||
files to find out the exact license.
|
individual files to find out the exact license.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,69 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// The YUV to RGB conversion code is derived from SDL's YUV overlay code, which
|
||||||
|
// in turn appears to be derived from mpeg_play. The following copyright
|
||||||
|
// notices have been included in accordance with the original license. Please
|
||||||
|
// note that the term "software" in this context only applies to the
|
||||||
|
// buildLookup() and plotYUV*() functions below.
|
||||||
|
|
||||||
|
// Copyright (c) 1995 The Regents of the University of California.
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Permission to use, copy, modify, and distribute this software and its
|
||||||
|
// documentation for any purpose, without fee, and without written agreement is
|
||||||
|
// hereby granted, provided that the above copyright notice and the following
|
||||||
|
// two paragraphs appear in all copies of this software.
|
||||||
|
//
|
||||||
|
// IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
|
||||||
|
// DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
|
||||||
|
// OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
|
||||||
|
// CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
//
|
||||||
|
// THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
|
||||||
|
// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||||
|
// AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
|
||||||
|
// ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
|
||||||
|
// PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
||||||
|
|
||||||
|
// Copyright (c) 1995 Erik Corry
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Permission to use, copy, modify, and distribute this software and its
|
||||||
|
// documentation for any purpose, without fee, and without written agreement is
|
||||||
|
// hereby granted, provided that the above copyright notice and the following
|
||||||
|
// two paragraphs appear in all copies of this software.
|
||||||
|
//
|
||||||
|
// IN NO EVENT SHALL ERIK CORRY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
|
||||||
|
// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
|
||||||
|
// THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ERIK CORRY HAS BEEN ADVISED
|
||||||
|
// OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
//
|
||||||
|
// ERIK CORRY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
||||||
|
// PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
|
||||||
|
// BASIS, AND ERIK CORRY HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
|
||||||
|
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
||||||
|
|
||||||
|
// Portions of this software Copyright (c) 1995 Brown University.
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Permission to use, copy, modify, and distribute this software and its
|
||||||
|
// documentation for any purpose, without fee, and without written agreement
|
||||||
|
// is hereby granted, provided that the above copyright notice and the
|
||||||
|
// following two paragraphs appear in all copies of this software.
|
||||||
|
//
|
||||||
|
// IN NO EVENT SHALL BROWN UNIVERSITY BE LIABLE TO ANY PARTY FOR
|
||||||
|
// DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
|
||||||
|
// OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF BROWN
|
||||||
|
// UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
//
|
||||||
|
// BROWN UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
||||||
|
// PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
|
||||||
|
// BASIS, AND BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
|
||||||
|
// SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
||||||
|
|
||||||
#include "graphics/video/mpeg_player.h"
|
#include "graphics/video/mpeg_player.h"
|
||||||
#include "common/file.h"
|
#include "common/file.h"
|
||||||
#include "common/system.h"
|
#include "common/system.h"
|
||||||
|
|
@ -284,69 +347,6 @@ void BaseAnimationState::buildLookup(int p, int lines) {
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
// The YUV to RGB conversion code is derived from SDL's YUV overlay code, which
|
|
||||||
// in turn appears to be derived from mpeg_play. The following copyright
|
|
||||||
// notices have been included in accordance with the original license. Please
|
|
||||||
// note that the term "software" in this context only applies to the two
|
|
||||||
// functions buildLookup() and plotYUV() below.
|
|
||||||
|
|
||||||
// Copyright (c) 1995 The Regents of the University of California.
|
|
||||||
// All rights reserved.
|
|
||||||
//
|
|
||||||
// Permission to use, copy, modify, and distribute this software and its
|
|
||||||
// documentation for any purpose, without fee, and without written agreement is
|
|
||||||
// hereby granted, provided that the above copyright notice and the following
|
|
||||||
// two paragraphs appear in all copies of this software.
|
|
||||||
//
|
|
||||||
// IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
|
|
||||||
// DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
|
|
||||||
// OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
|
|
||||||
// CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
//
|
|
||||||
// THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
|
|
||||||
// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
||||||
// AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
|
|
||||||
// ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
|
|
||||||
// PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
|
||||||
|
|
||||||
// Copyright (c) 1995 Erik Corry
|
|
||||||
// All rights reserved.
|
|
||||||
//
|
|
||||||
// Permission to use, copy, modify, and distribute this software and its
|
|
||||||
// documentation for any purpose, without fee, and without written agreement is
|
|
||||||
// hereby granted, provided that the above copyright notice and the following
|
|
||||||
// two paragraphs appear in all copies of this software.
|
|
||||||
//
|
|
||||||
// IN NO EVENT SHALL ERIK CORRY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
|
|
||||||
// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
|
|
||||||
// THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ERIK CORRY HAS BEEN ADVISED
|
|
||||||
// OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
//
|
|
||||||
// ERIK CORRY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
|
||||||
// PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
|
|
||||||
// BASIS, AND ERIK CORRY HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
|
|
||||||
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
|
||||||
|
|
||||||
// Portions of this software Copyright (c) 1995 Brown University.
|
|
||||||
// All rights reserved.
|
|
||||||
//
|
|
||||||
// Permission to use, copy, modify, and distribute this software and its
|
|
||||||
// documentation for any purpose, without fee, and without written agreement
|
|
||||||
// is hereby granted, provided that the above copyright notice and the
|
|
||||||
// following two paragraphs appear in all copies of this software.
|
|
||||||
//
|
|
||||||
// IN NO EVENT SHALL BROWN UNIVERSITY BE LIABLE TO ANY PARTY FOR
|
|
||||||
// DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
|
|
||||||
// OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF BROWN
|
|
||||||
// UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
//
|
|
||||||
// BROWN UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
|
||||||
// PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
|
|
||||||
// BASIS, AND BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
|
|
||||||
// SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
|
||||||
|
|
||||||
void BaseAnimationState::buildLookup() {
|
void BaseAnimationState::buildLookup() {
|
||||||
// Do we already have lookup tables for this bit format?
|
// Do we already have lookup tables for this bit format?
|
||||||
Graphics::PixelFormat format = _sys->getOverlayFormat();
|
Graphics::PixelFormat format = _sys->getOverlayFormat();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue