diff options
| -rw-r--r-- | Copyright | 3 | ||||
| -rw-r--r-- | video/out/vo.c | 2 | ||||
| -rw-r--r-- | video/vaapi.c | 14 | ||||
| -rw-r--r-- | video/vaapi.h | 14 | ||||
| -rw-r--r-- | wscript | 4 | ||||
| -rw-r--r-- | wscript_build.py | 2 |
6 files changed, 19 insertions, 20 deletions
@@ -40,7 +40,7 @@ a number of useful features, some of them quite central: - Linux X11 video output - Linux audio output via ALSA (PulseAudio works) - BSD audio output via OSS -- Linux hardware decoding (vaapi, vdpau) +- NVIDIA/Linux hardware decoding (vdpau, although CUDA usually works) - many builtin video filters (use libavfilter instead) - automatic rotation and stereoscopic video handling - Linux TV input @@ -119,7 +119,6 @@ The following files are still GPL: video/out/vo_x11.c probably impossible video/out/vo_xv.c probably impossible video/out/x11_common.* probably impossible - video/vaapi.* hard (GPL-only parts must be ifdefed) video/vdpau.c hard (GPL-only parts must be ifdefed) video/vdpau.h unknown video/vdpau_mixer.* actual code must be rewritten diff --git a/video/out/vo.c b/video/out/vo.c index e9ef80f6af..4eb0558147 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -86,7 +86,7 @@ const struct vo_driver *const video_out_drivers[] = #if HAVE_SDL2 &video_out_sdl, #endif -#if HAVE_VAAPI_X11 +#if HAVE_VAAPI_X11 && HAVE_GPL &video_out_vaapi, #endif #if HAVE_X11 diff --git a/video/vaapi.c b/video/vaapi.c index 44ac530f1d..055316bb38 100644 --- a/video/vaapi.c +++ b/video/vaapi.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 <assert.h> diff --git a/video/vaapi.h b/video/vaapi.h index fe082653a1..2e438bebfb 100644 --- a/video/vaapi.h +++ b/video/vaapi.h @@ -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/>. */ #ifndef MPV_VAAPI_H @@ -700,7 +700,7 @@ video_output_features = [ }, { 'name': '--vaapi', 'desc': 'VAAPI acceleration', - 'deps': 'gpl && libdl && (x11 || wayland || egl-drm)', + 'deps': 'libdl && (x11 || wayland || egl-drm)', 'func': check_pkg_config('libva', '>= 0.36.0'), }, { 'name': '--vaapi-x11', @@ -720,7 +720,7 @@ video_output_features = [ }, { 'name': '--vaapi-glx', 'desc': 'VAAPI GLX', - 'deps': 'vaapi-x11 && gl-x11', + 'deps': 'gpl && vaapi-x11 && gl-x11', 'func': check_true, }, { 'name': '--vaapi-x-egl', diff --git a/wscript_build.py b/wscript_build.py index 17f103e57e..3f64058a43 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -436,7 +436,7 @@ def build(ctx): ( "video/out/vo_opengl_cb.c", "gl" ), ( "video/out/vo_sdl.c", "sdl2" ), ( "video/out/vo_tct.c" ), - ( "video/out/vo_vaapi.c", "vaapi-x11" ), + ( "video/out/vo_vaapi.c", "vaapi-x11 && gpl" ), ( "video/out/vo_vdpau.c", "vdpau" ), ( "video/out/vo_wayland.c", "wayland" ), ( "video/out/vo_x11.c" , "x11" ), |