diff options
| -rw-r--r-- | Copyright | 6 | ||||
| -rw-r--r-- | demux/demux_mf.c | 20 | ||||
| -rw-r--r-- | stream/stream_mf.c | 14 |
3 files changed, 23 insertions, 17 deletions
@@ -141,7 +141,7 @@ x audio/audio.* very hard (mp_audio based of anders' af_audi demux/demux_edl.c LGPL demux/demux_lavf.c almost 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_timeline.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/frequencies.* must stay GPL stream/rar.* LGPL - stream/stream_avdevice.c unknown + stream/stream_avdevice.c LGPL stream/stream_bluray.c unknown stream/stream.* 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_libarchive.* LGPL stream/stream_memory.c LGPL - stream/stream_mf.c unknown + stream/stream_mf.c LGPL stream/stream_null.c LGPL stream/stream_rar.c LGPL stream/stream_smb.c will stay GPLv3 diff --git a/demux/demux_mf.c b/demux/demux_mf.c index 4b09ad8e86..02b95e1c15 100644 --- a/demux/demux_mf.c +++ b/demux/demux_mf.c @@ -1,18 +1,24 @@ /* * 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 3 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/>. + * + * 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> diff --git a/stream/stream_mf.c b/stream/stream_mf.c index ca6ab6ae88..fbee82924a 100644 --- a/stream/stream_mf.c +++ b/stream/stream_mf.c @@ -6,18 +6,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/>. */ #include "config.h" |