From bf02746a9850cb1e48602994daf723bc0a340b1c Mon Sep 17 00:00:00 2001 From: EkeEke Date: Sun, 23 Nov 2014 20:58:01 +0100 Subject: [PATCH] [Gamecube/Wii] changed VI encoder code license to libogc --- gx/utils/vi_encoder.c | 23 +++++++++-------------- gx/utils/vi_encoder.h | 23 +++++++++-------------- 2 files changed, 18 insertions(+), 28 deletions(-) diff --git a/gx/utils/vi_encoder.c b/gx/utils/vi_encoder.c index 402fa79..71daa7f 100644 --- a/gx/utils/vi_encoder.c +++ b/gx/utils/vi_encoder.c @@ -5,23 +5,18 @@ * * Copyright (C) 2009 Eke-Eke, with some code from libogc (C) Hector Martin * - * Redistribution and use of this code or any derivative works are permitted - * provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * - * - Redistributions may not be sold, nor may they be used in a commercial - * product or activity. + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. * - * - Redistributions that are modified from the original source must include the - * complete source code, including the source code for all components used by a - * binary built from the modified sources. However, as a special exception, the - * source code distributed need not include anything that is normally distributed - * (in either source or binary form) with the major components (compiler, kernel, - * and so on) of the operating system on which the executable runs, unless that - * component itself accompanies the executable. + * 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. * - * - Redistributions 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/gx/utils/vi_encoder.h b/gx/utils/vi_encoder.h index f5290dc..1325fe6 100644 --- a/gx/utils/vi_encoder.h +++ b/gx/utils/vi_encoder.h @@ -5,23 +5,18 @@ * * Copyright (C) 2009 Eke-Eke, with some code from libogc (C) Hector Martin * - * Redistribution and use of this code or any derivative works are permitted - * provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * - * - Redistributions may not be sold, nor may they be used in a commercial - * product or activity. + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. * - * - Redistributions that are modified from the original source must include the - * complete source code, including the source code for all components used by a - * binary built from the modified sources. However, as a special exception, the - * source code distributed need not include anything that is normally distributed - * (in either source or binary form) with the major components (compiler, kernel, - * and so on) of the operating system on which the executable runs, unless that - * component itself accompanies the executable. + * 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. * - * - Redistributions 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE