demux_mf, stream_mf: change license to LGPL

cehoyos, who did not agree to the relicensing, added bcb5c78ce3. If
there was copyright, we consider it gone, because the table changed. It
does not map file extension to a FourCC anymore, and codecs.conf is
gone. The new mapping is a libavcodec codec name (happens to be the same
as the file extension).

The same applies to commits 60ecafec, b749836b, 5b3e3be1. None of these
authors were contacted. These were before the code was replaced with a
table (in d0326807). The parts outside of demux_mf.c were removed a long
time ago. Like in the previous comment, we don't think any copyright
applies at least to the new code (at least after the FourCC removal).

iive authored 0aa37a0d, which is probably still left in some form, and
makes demux_mf.c "LGPL 3 or later".

stream_avdevice.c (unrelated) has been marked as LGPL before.
This commit is contained in:
wm4 2017-06-24 13:19:51 +02:00
parent c9696a1b14
commit fcbcd1d3c0
3 changed files with 23 additions and 17 deletions

View File

@ -141,7 +141,7 @@ x audio/audio.* very hard (mp_audio based of anders' af_audi
demux/demux_edl.c LGPL demux/demux_edl.c LGPL
demux/demux_lavf.c almost LGPL demux/demux_lavf.c almost LGPL
demux/demux_libarchive.c LGPL demux/demux_libarchive.c LGPL
demux/demux_mf.c hard demux/demux_mf.c LGPLv3+
demux/demux_mkv.c LGPL (mostly) demux/demux_mkv.c LGPL (mostly)
demux/demux_mkv_timeline.c LGPL demux/demux_mkv_timeline.c LGPL
demux/demux_null.c LGPL demux/demux_null.c LGPL
@ -244,7 +244,7 @@ x player/audio.c LGPL (dysfunctional due to libaf)
stream/dvb* must stay GPL stream/dvb* must stay GPL
stream/frequencies.* must stay GPL stream/frequencies.* must stay GPL
stream/rar.* LGPL stream/rar.* LGPL
stream/stream_avdevice.c unknown stream/stream_avdevice.c LGPL
stream/stream_bluray.c unknown stream/stream_bluray.c unknown
stream/stream.* LGPL stream/stream.* LGPL
stream/stream_cb.c LGPL stream/stream_cb.c LGPL
@ -258,7 +258,7 @@ x player/audio.c LGPL (dysfunctional due to libaf)
stream/stream_lavf.c LGPL stream/stream_lavf.c LGPL
stream/stream_libarchive.* LGPL stream/stream_libarchive.* LGPL
stream/stream_memory.c LGPL stream/stream_memory.c LGPL
stream/stream_mf.c unknown stream/stream_mf.c LGPL
stream/stream_null.c LGPL stream/stream_null.c LGPL
stream/stream_rar.c LGPL stream/stream_rar.c LGPL
stream/stream_smb.c will stay GPLv3 stream/stream_smb.c will stay GPLv3

View File

@ -1,18 +1,24 @@
/* /*
* 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 3 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/>.
*
* The parts making this file LGPL v3 (instead of v2.1 or later) are:
* 0aa37a0db23c allow autodetection of pictures type when using mf://@fil...
* (iive agreed to LGPL v3+ only.)
* Once these changes are not relevant to for copyright anymore (e.g. because
* they have been removed), this file will change to LGPLv2.1+.
*/ */
#include <stdio.h> #include <stdio.h>

View File

@ -6,18 +6,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"