summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-10-10 15:51:16 +0200
committerwm4 <wm4@nowhere>2017-10-10 15:51:16 +0200
commit14541ae2583f2ce1c8b8ebc2dd6cc49235207fc6 (patch)
tree14f622db59a3fd0265fd4e6541cedb6781879dde /video/out
parent7c66c2bb75bb9f252dc976ab1805fecc610438e7 (diff)
downloadmpv-14541ae2583f2ce1c8b8ebc2dd6cc49235207fc6.tar.bz2
mpv-14541ae2583f2ce1c8b8ebc2dd6cc49235207fc6.tar.xz
Add checks for HAVE_GPL to various GPL-only source files
This should actually cover all of them, if you take into account that some unchanged GPL source files include header files with such checks. Also this was done already for the libaf derived code. This is only for "safety" and to avoid misunderstandings.
Diffstat (limited to 'video/out')
-rw-r--r--video/out/opengl/hwdec_vaglx.c5
-rw-r--r--video/out/vo_caca.c5
-rw-r--r--video/out/vo_direct3d.c5
-rw-r--r--video/out/x11_common.h5
4 files changed, 20 insertions, 0 deletions
diff --git a/video/out/opengl/hwdec_vaglx.c b/video/out/opengl/hwdec_vaglx.c
index d5bc0b6ee7..2ad7970859 100644
--- a/video/out/opengl/hwdec_vaglx.c
+++ b/video/out/opengl/hwdec_vaglx.c
@@ -30,6 +30,11 @@
#include "ra_gl.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct priv_owner {
struct mp_vaapi_ctx *ctx;
VADisplay *display;
diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c
index 46090afc4a..e63bd69b1d 100644
--- a/video/out/vo_caca.c
+++ b/video/out/vo_caca.c
@@ -42,6 +42,11 @@
#include "common/msg.h"
#include "input/input.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct priv {
caca_canvas_t *canvas;
caca_display_t *display;
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 952dca85ce..a131d210cb 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -40,6 +40,11 @@
#include "w32_common.h"
#include "sub/osd.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
// shaders generated by fxc.exe from d3d_shader_yuv.hlsl
#include "d3d_shader_420p.h"
diff --git a/video/out/x11_common.h b/video/out/x11_common.h
index e69640cc64..1c0096329c 100644
--- a/video/out/x11_common.h
+++ b/video/out/x11_common.h
@@ -29,6 +29,11 @@
#include "common/common.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct vo;
struct mp_log;