diff options
| author | wm4 <wm4@nowhere> | 2017-06-15 15:52:18 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-06-15 16:32:47 +0200 |
| commit | a3f0bf916ddf47ba4e94ad538e32e106756dedf7 (patch) | |
| tree | 6037354dd454928abaa5192b4f4fcd116030f718 /video/decode/vd.h | |
| parent | b8193e40719a2a72d9b25e8ea3070c0e84beb48e (diff) | |
| download | mpv-a3f0bf916ddf47ba4e94ad538e32e106756dedf7.tar.bz2 mpv-a3f0bf916ddf47ba4e94ad538e32e106756dedf7.tar.xz | |
vd, vd_lavc: change license to LGPL (almost)
iive agreed only to LGPL 3.0+ only. All of his relevant changes are for
XvMC, for which mpv completely dropped support back in mplayer2 times.
But you could claim that the get_format code represents some residual
copyright (everything else added by iive was removed, only get_format
still is around in some form). While I doubt that this is relly
copyright-relevant, consider it is for now.
michael is the original author of vd_lavc.c, so this file can become
LGPL only after the core becomes LGPL.
cehoyos did not agree with the LGPL relicensing, but all of his code is
gone.
Some others could not be reached, but their code is gone as well. In
particular, vdpau support, which was originally done by Nvidia, had
larger impact on vd_lavc.c, but vdpau support was first refactored a few
times (for the purpose of modularization) and moved to different files,
and then decoding was completely moved to libavcodec.
Lastly, assigning the "opaque" field was moved by Gwenole Beauchesne in
commit 8e5edec13eab. Agreement is pending (due to copyright apparently
owned by the author's employer). So just undo the change, so we don't
have to think about whether the change is copyrightable.
Diffstat (limited to 'video/decode/vd.h')
| -rw-r--r-- | video/decode/vd.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/video/decode/vd.h b/video/decode/vd.h index 3897eedc31..980de44bdc 100644 --- a/video/decode/vd.h +++ b/video/decode/vd.h @@ -1,18 +1,18 @@ /* * This file is part of mpv. * - * 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 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 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 General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see <http://www.gnu.org/licenses/>. */ #ifndef MPLAYER_VD_H |