diff --git a/Copyright b/Copyright index b6af687686..b574b41df9 100644 --- a/Copyright +++ b/Copyright @@ -261,8 +261,8 @@ LGPL relicensing status: video/decode/vd.h hard video/decode/vd_lavc.c very hard video/filter/refqueue.* LGPL - video/filter/vf.c medium - video/filter/vf.h medium + video/filter/vf.c LGPL + video/filter/vf.h LGPL (mostly) video/filter/vf_buffer.c LGPL video/filter/vf_crop.c will be deleted video/filter/vf_d3d11vpp.c LGPL diff --git a/video/filter/vf.c b/video/filter/vf.c index 004df75c2b..ad427992d7 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -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 . + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . */ #include diff --git a/video/filter/vf.h b/video/filter/vf.h index 241af02081..4cb7b4c1c6 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -1,18 +1,20 @@ /* * 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 . + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . + * + * Parts under HAVE_GPL are licensed under GNU General Public License. */ #ifndef MPLAYER_VF_H @@ -20,6 +22,8 @@ #include +#include "config.h" + #include "video/mp_image.h" #include "common/common.h" @@ -145,8 +149,10 @@ enum vf_ctrl { VFCTRL_SEEK_RESET = 1, // reset on picture and PTS discontinuities VFCTRL_SET_EQUALIZER, // set color options (brightness,contrast etc) VFCTRL_GET_EQUALIZER, // get color options (brightness,contrast etc) +#if HAVE_GPL VFCTRL_SET_DEINTERLACE, // Set deinterlacing status VFCTRL_GET_DEINTERLACE, // Get deinterlacing status +#endif VFCTRL_GET_METADATA, // Get frame metadata from lavfi filters (e.g., cropdetect) /* Hack to make the OSD state object available to vf_sub which * access OSD/subtitle state outside of normal OSD draw time. */