summaryrefslogtreecommitdiffstats
path: root/video/out/vo.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-05 21:05:31 +0200
committerwm4 <wm4@nowhere>2016-09-05 21:26:39 +0200
commit327cb2a06c32f2c05fc266272936080d06103a63 (patch)
tree17a9a0c160073a4090d1f2d59ae107f056080051 /video/out/vo.c
parent9e6b9d8a982eb07a05fd059a92f1d6b2f01460a0 (diff)
downloadmpv-327cb2a06c32f2c05fc266272936080d06103a63.tar.bz2
mpv-327cb2a06c32f2c05fc266272936080d06103a63.tar.xz
vo_direct3d: deprecate direct3d_shaders alias
And remove the difference between the aliases. This is needed to make the sub-option changes less painful.
Diffstat (limited to 'video/out/vo.c')
-rw-r--r--video/out/vo.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index 050a5303e6..3e6a2c7070 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -55,7 +55,6 @@ extern const struct vo_driver video_out_lavc;
extern const struct vo_driver video_out_caca;
extern const struct vo_driver video_out_drm;
extern const struct vo_driver video_out_direct3d;
-extern const struct vo_driver video_out_direct3d_shaders;
extern const struct vo_driver video_out_sdl;
extern const struct vo_driver video_out_vaapi;
extern const struct vo_driver video_out_wayland;
@@ -73,7 +72,6 @@ const struct vo_driver *const video_out_drivers[] =
&video_out_vdpau,
#endif
#if HAVE_DIRECT3D
- &video_out_direct3d_shaders,
&video_out_direct3d,
#endif
#if HAVE_WAYLAND
@@ -186,7 +184,8 @@ const struct m_obj_list vo_obj_list = {
.get_desc = get_desc,
.description = "video outputs",
.aliases = {
- {"gl", "opengl"},
+ {"gl", "opengl"},
+ {"direct3d_shaders", "direct3d"},
{0}
},
.allow_unknown_entries = true,