From e544c3f7b3a4c77753b3762abf114cc56b44d9c4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 29 Sep 2017 18:44:47 +0200 Subject: vaapi: change license to LGPL Originally mpv vaapi support was based on the MPlayer-vaapi patches. These were never merged in upstream MPlayer. The license headers indicated they were GPL-only. Although the actual author agreed to relicensing, the company employing him to write this code did not, so the original code is unusable to us. Fortunately, vaapi support was refactored and rewritten several times, meaning little code is actually left. The previous commits removed or moved that to GPL-only code. Namely, vo_vaapi.c remains GPL-only. The other code went away or became unnecessary mainly because libavcodec itself gained the ability to manage the hw decoder, and libavutil provides code to manage vaapi surfaces. We also changed to mainly using EGL interop, making any of the old rendering code unnecessary. hwdec_vaglx.c is still GPL. It's possibly relicensable, because much of it was changed, but I'm not too sure and further investigation would be required. Also, this has been disabled by default for a while now, so bothering with this is a waste of time. This commit simply disables it at compile time as well in LGPL mode. --- wscript_build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript_build.py') 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" ), -- cgit v1.2.3