summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-09-22 05:35:26 +0200
committerwm4 <wm4@nowhere>2017-09-22 05:35:26 +0200
commit2b5da4804cbd54ee780d5abddd17d83fbd2cddec (patch)
treed2215162aeb97570998a548a56c9e7d55c237d97 /options
parent2b855739d50ff924a8124bc61f72a375a88af06f (diff)
downloadmpv-2b5da4804cbd54ee780d5abddd17d83fbd2cddec.tar.bz2
mpv-2b5da4804cbd54ee780d5abddd17d83fbd2cddec.tar.xz
build: make vo_gpu + infrastructure non-optional
Also readd the the error message for when no GL backends are found (why was this removed?).
Diffstat (limited to 'options')
-rw-r--r--options/options.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/options/options.c b/options/options.c
index 18b6bb8dd8..1168cc196b 100644
--- a/options/options.c
+++ b/options/options.c
@@ -57,9 +57,7 @@
#include "video/out/drm_common.h"
#endif
-#if HAVE_GPU
#include "video/out/gpu/hwdec.h"
-#endif
static void print_version(struct mp_log *log)
{
@@ -181,11 +179,9 @@ static const m_option_t mp_vo_opt_list[] = {
0, drm_validate_connector_opt),
OPT_INT("drm-mode", drm_mode_id, 0),
#endif
-#if HAVE_GL
OPT_STRING_VALIDATE("opengl-hwdec-interop", gl_hwdec_interop, 0,
ra_hwdec_validate_opt),
OPT_REPLACED("hwdec-preload", "opengl-hwdec-interop"),
-#endif
{0}
};
@@ -688,9 +684,7 @@ const m_option_t mp_opts[] = {
OPT_SUBSTRUCT("", vo, vo_sub_opts, 0),
OPT_SUBSTRUCT("", demux_opts, demux_conf, 0),
-#if HAVE_GPU
OPT_SUBSTRUCT("", gl_video_opts, gl_video_conf, 0),
-#endif
#if HAVE_GL
OPT_SUBSTRUCT("", opengl_opts, opengl_conf, 0),