diff options
| -rw-r--r-- | Copyright | 6 | ||||
| -rw-r--r-- | player/video.c | 4 | ||||
| -rw-r--r-- | video/out/vo.c | 14 | ||||
| -rw-r--r-- | video/out/vo.h | 17 | ||||
| -rw-r--r-- | video/out/vo_null.c | 14 |
5 files changed, 24 insertions, 31 deletions
@@ -301,14 +301,14 @@ LGPL relicensing status: video/out/drm_common.* LGPL video/out/filter_kernels.* LGPL (BSD) video/out/opengl/* LGPL - video/out/vo.c hard - video/out/vo.h hard + video/out/vo.c LGPL + video/out/vo.h LGPL video/out/vo_caca.c unknown video/out/vo_direct3d.c unknown video/out/vo_drm.c LGPL video/out/vo_image.c unknown video/out/vo_lavc.c unknown - video/out/vo_null.c unknown + video/out/vo_null.c LGPL video/out/vo_opengl.c LGPL video/out/vo_opengl_cb.c LGPL video/out/vo_rpi.c LGPL diff --git a/player/video.c b/player/video.c index 3bbb2dc275..ab7c6f281d 100644 --- a/player/video.c +++ b/player/video.c @@ -107,10 +107,6 @@ int video_vf_vo_control(struct vo_chain *vo_c, int vf_cmd, void *data) } switch (vf_cmd) { - case VFCTRL_GET_DEINTERLACE: - return vo_control(vo_c->vo, VOCTRL_GET_DEINTERLACE, data) == VO_TRUE; - case VFCTRL_SET_DEINTERLACE: - return vo_control(vo_c->vo, VOCTRL_SET_DEINTERLACE, data) == VO_TRUE; case VFCTRL_SET_EQUALIZER: { vf_equalizer_t *eq = data; if (!vo_c->vo->config_ok) diff --git a/video/out/vo.c b/video/out/vo.c index 1b71212f25..79fc4f3bb4 100644 --- a/video/out/vo.c +++ b/video/out/vo.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 <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 <stdio.h> diff --git a/video/out/vo.h b/video/out/vo.h index 724e03ca41..c59e1b04c8 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -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/>. */ #ifndef MPLAYER_VIDEO_OUT_H @@ -90,9 +90,6 @@ enum mp_voctrl { VOCTRL_KILL_SCREENSAVER, VOCTRL_RESTORE_SCREENSAVER, - VOCTRL_SET_DEINTERLACE, - VOCTRL_GET_DEINTERLACE, - // Return or set window size (not-fullscreen mode only - if fullscreened, // these must access the not-fullscreened window size only). VOCTRL_GET_UNFS_WINDOW_SIZE, // int[2] (w/h) diff --git a/video/out/vo_null.c b/video/out/vo_null.c index fcf8dc9051..a9b1ed12a4 100644 --- a/video/out/vo_null.c +++ b/video/out/vo_null.c @@ -5,18 +5,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 <stdlib.h> |