diff options
| author | wm4 <wm4@nowhere> | 2017-07-01 12:51:18 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-07-01 12:51:18 +0200 |
| commit | aee81828e2e627ca33e66f87428add220b06f7a7 (patch) | |
| tree | 2f0d1e438dda3311c107dd7862888b31b8fd933a | |
| parent | f281ecc4c07afb1fef563930dd7a1d751d9ec259 (diff) | |
| download | mpv-aee81828e2e627ca33e66f87428add220b06f7a7.tar.bz2 mpv-aee81828e2e627ca33e66f87428add220b06f7a7.tar.xz | |
sws_utils: switch back to GPL
Actually contains some code fragments by Michael Niedermayer (command
line stuff, video equalizer), thus it can be LGPL only once the formal
requirement of mpv's core being LGPL is fulfilled.
| -rw-r--r-- | Copyright | 2 | ||||
| -rw-r--r-- | video/sws_utils.c | 16 |
2 files changed, 10 insertions, 8 deletions
@@ -343,7 +343,7 @@ x player/audio.c LGPL (dysfunctional due to libaf) video/out/win_state.* LGPL video/out/x11_common.* probably impossible video/out/x11_icon.bin LGPL - video/sws_utils.* LGPL + video/sws_utils.* almost LGPL video/vaapi.* hard (GPL-only parts must be ifdefed) video/vdpau.c hard (GPL-only parts must be ifdefed) video/vdpau_functions.inc LGPL diff --git a/video/sws_utils.c b/video/sws_utils.c index 33eae6efa9..974a111e83 100644 --- a/video/sws_utils.c +++ b/video/sws_utils.c @@ -1,18 +1,20 @@ /* * This file is part of mpv. * - * mpv 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. + * mpv is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * mpv 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. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with mpv. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU General Public License along + * with mpv. If not, see <http://www.gnu.org/licenses/>. + * + * Almost LGPL. */ #include <assert.h> |