diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-07-09 15:38:23 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-07-23 10:52:24 +0200 |
| commit | 00a9ac424eeb273785cc529f14e481ff88c02eac (patch) | |
| tree | e6704c04007416e842595d72a6f9fc379a32864d | |
| parent | 4095fa903830f8395a26d6ee38c77ad6333a4f5e (diff) | |
| download | ffmpeg-00a9ac424eeb273785cc529f14e481ff88c02eac.tar.gz | |
examples/encoding.c: adopt a less restrictive license
Adopt ISC (Internet Systems Consortium) license in place of LGPL,
consistent with the other examples.
Fabrice explicitely approved the relicensing.
| -rw-r--r-- | doc/examples/encoding.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/doc/examples/encoding.c b/doc/examples/encoding.c index 042947a060..7efd5facce 100644 --- a/doc/examples/encoding.c +++ b/doc/examples/encoding.c @@ -1,21 +1,23 @@ /* * Copyright (c) 2001 Fabrice Bellard * - * This file is part of FFmpeg. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. */ /** |