RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux_raw: change license to LGPL 

All relevant authors have agreed.

I'm removing the NV12 FourCC, which was added in f910f3d9 by someone who
was not contacted for the relicensing. I doubt the remaining code is
copyrightable (basically all what remains the fact is that NV12 uses the
same amount of space like YV12), but in this case I feel more
comfortable removing it.

Might contain some trace amounts of "michael"'s copyright, who agrees
with LGPL only once the core is relicensed - but with the core already
mostly relicensed, I'm changing the license header to LGPL, and only
marking this in the "Copyright" file.
This commit is contained in:
wm4 2017-06-24 13:56:53 +02:00
parent fcbcd1d3c0
commit f033c488e8
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Copyright
View File

@ -147,7 +147,7 @@ x audio/audio.* very hard (mp_audio based of anders' af_audi
demux/demux_null.c LGPL demux/demux_null.c LGPL
demux/demux_playlist.c LGPL demux/demux_playlist.c LGPL
demux/demux_rar.c LGPL demux/demux_rar.c LGPL
demux/demux_raw.c unknown demux/demux_raw.c almost LGPL
demux/demux_timeline.c LGPL demux/demux_timeline.c LGPL
demux/demux_tv.c will stay GPL demux/demux_tv.c will stay GPL
demux/ebml.* LGPL demux/ebml.* LGPL

15
demux/demux_raw.c
View File

@ -1,18 +1,18 @@
/* /*
* This file is part of mpv. * This file is part of mpv.
* *
* mpv is free software; you can redistribute it and/or modify * mpv is free software; you can redistribute it and/or
* it under the terms of the GNU General Public License as published by * modify it under the terms of the GNU Lesser General Public
* the Free Software Foundation; either version 2 of the License, or * License as published by the Free Software Foundation; either
* (at your option) any later version. * version 2.1 of the License, or (at your option) any later version.
* *
* mpv is distributed in the hope that it will be useful, * mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * 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 * You should have received a copy of the GNU Lesser General Public
* with mpv. If not, see <http://www.gnu.org/licenses/>. * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "config.h" #include "config.h"
@ -223,7 +223,6 @@ static int demux_rawvideo_open(demuxer_t *demuxer, enum demux_check check)
case MKTAG('Y', 'V', '1', '2'): case MKTAG('Y', 'V', '1', '2'):
case MKTAG('I', '4', '2', '0'): case MKTAG('I', '4', '2', '0'):
case MKTAG('I', 'Y', 'U', 'V'): case MKTAG('I', 'Y', 'U', 'V'):
case MKTAG('N', 'V', '1', '2'):
bpp = 12; bpp = 12;
break; break;
case MKTAG('U', 'Y', 'V', 'Y'): case MKTAG('U', 'Y', 'V', 'Y'):