mirror of
https://github.com/mpv-player/mpv
synced 2024-12-24 15:52:25 +00:00
vf.c, vf.h: change license to LGPL
Most authors have agreed. Like with vo.c, we don't take module declarations into consideration (see0e09533c73
). Notable issues:115bfb9762
: the author has (probably) not agreed. The vf.c changes were removed with the removal of filter DR, though (seec54fc507da
).7b25afd742
: the same author adds VOCTRLs for deinterlacing switching at runtime. Put them under a HAVE_GPL ifdef just to be sure. (It looks like we could remove the VOCTRLs immediately, as they're needed only for some compatibility things, but no need to do that yet.)02b199e5e9
: the author had a conditional agreement to LGPL, which doesn't allow us to change it just yet, but the code added here was completely removed anyway. (These days, the pts is passed as mp_image field, and put_image is gone.)3532cd532e
: same author, but code removed with DR removal.f0626e2f8d
: same author, but code was moved to mp_image.c.e5b4b495c3
: agreed to LGPLv3+ only, but the code was removed incfa1f9e082
anyway.086c324692
: author was not asked - minor warning fix, but no mpv includes malloc.h anymore.e9d0a1d609
: author was not asked - removed again in33b62af947
.c260a1139d
: author could not be reached - but this code was removed when mpv changed the image allocation code to essentially use FFmpeg's pixdesc.
This commit is contained in:
parent
faefbbaaa5
commit
c0ba8b520f
@ -261,8 +261,8 @@ LGPL relicensing status:
|
|||||||
video/decode/vd.h hard
|
video/decode/vd.h hard
|
||||||
video/decode/vd_lavc.c very hard
|
video/decode/vd_lavc.c very hard
|
||||||
video/filter/refqueue.* LGPL
|
video/filter/refqueue.* LGPL
|
||||||
video/filter/vf.c medium
|
video/filter/vf.c LGPL
|
||||||
video/filter/vf.h medium
|
video/filter/vf.h LGPL (mostly)
|
||||||
video/filter/vf_buffer.c LGPL
|
video/filter/vf_buffer.c LGPL
|
||||||
video/filter/vf_crop.c will be deleted
|
video/filter/vf_crop.c will be deleted
|
||||||
video/filter/vf_d3d11vpp.c LGPL
|
video/filter/vf_d3d11vpp.c LGPL
|
||||||
|
@ -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 <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -1,18 +1,20 @@
|
|||||||
/*
|
/*
|
||||||
* 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/>.
|
||||||
|
*
|
||||||
|
* Parts under HAVE_GPL are licensed under GNU General Public License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MPLAYER_VF_H
|
#ifndef MPLAYER_VF_H
|
||||||
@ -20,6 +22,8 @@
|
|||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include "video/mp_image.h"
|
#include "video/mp_image.h"
|
||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
|
|
||||||
@ -145,8 +149,10 @@ enum vf_ctrl {
|
|||||||
VFCTRL_SEEK_RESET = 1, // reset on picture and PTS discontinuities
|
VFCTRL_SEEK_RESET = 1, // reset on picture and PTS discontinuities
|
||||||
VFCTRL_SET_EQUALIZER, // set color options (brightness,contrast etc)
|
VFCTRL_SET_EQUALIZER, // set color options (brightness,contrast etc)
|
||||||
VFCTRL_GET_EQUALIZER, // get color options (brightness,contrast etc)
|
VFCTRL_GET_EQUALIZER, // get color options (brightness,contrast etc)
|
||||||
|
#if HAVE_GPL
|
||||||
VFCTRL_SET_DEINTERLACE, // Set deinterlacing status
|
VFCTRL_SET_DEINTERLACE, // Set deinterlacing status
|
||||||
VFCTRL_GET_DEINTERLACE, // Get deinterlacing status
|
VFCTRL_GET_DEINTERLACE, // Get deinterlacing status
|
||||||
|
#endif
|
||||||
VFCTRL_GET_METADATA, // Get frame metadata from lavfi filters (e.g., cropdetect)
|
VFCTRL_GET_METADATA, // Get frame metadata from lavfi filters (e.g., cropdetect)
|
||||||
/* Hack to make the OSD state object available to vf_sub which
|
/* Hack to make the OSD state object available to vf_sub which
|
||||||
* access OSD/subtitle state outside of normal OSD draw time. */
|
* access OSD/subtitle state outside of normal OSD draw time. */
|
||||||
|
Loading…
Reference in New Issue
Block a user