9 files changed, 10 insertions, 2 deletions
diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c
index e3fc1ba032..6d361217b9 100644
--- a/video/out/opengl/common.c
+++ b/video/out/opengl/common.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <strings.h>
 #include <stdbool.h>
 #include <math.h>
 #include <assert.h>
diff --git a/video/out/opengl/context_android.c b/video/out/opengl/context_android.c
index bc1717c1be..269f36dbc3 100644
--- a/video/out/opengl/context_android.c
+++ b/video/out/opengl/context_android.c
@@ -123,6 +123,7 @@ static int android_control(struct ra_ctx *ctx, int *events, int request, void *a
 const struct ra_ctx_fns ra_ctx_android = {
     .type           = "opengl",
     .name           = "android",
+    .description    = "Android/EGL",
     .reconfig       = android_reconfig,
     .control        = android_control,
     .init           = android_init,
diff --git a/video/out/opengl/context_angle.c b/video/out/opengl/context_angle.c
index 553718af24..3a70c09c7e 100644
--- a/video/out/opengl/context_angle.c
+++ b/video/out/opengl/context_angle.c
@@ -646,6 +646,7 @@ static int angle_control(struct ra_ctx *ctx, int *events, int request, void *arg
 const struct ra_ctx_fns ra_ctx_angle = {
     .type           = "opengl",
     .name           = "angle",
+    .description    = "Win32/ANGLE (via Direct3D)",
     .init           = angle_init,
     .reconfig       = angle_reconfig,
     .control        = angle_control,
diff --git a/video/out/opengl/context_drm_egl.c b/video/out/opengl/context_drm_egl.c
index ff4de187cb..da28093562 100644
--- a/video/out/opengl/context_drm_egl.c
+++ b/video/out/opengl/context_drm_egl.c
@@ -491,7 +491,8 @@ static void drm_egl_uninit(struct ra_ctx *ctx)
         if (p->gbm.surface)
             gbm_surface_destroy(p->gbm.surface);
         eglTerminate(p->egl.display);
-        gbm_device_destroy(p->gbm.device);
+        if (p->gbm.device)
+            gbm_device_destroy(p->gbm.device);
 
         if (p->drm_params.render_fd != -1)
             close(p->drm_params.render_fd);
@@ -739,6 +740,7 @@ static void drm_egl_wakeup(struct ra_ctx *ctx)
 const struct ra_ctx_fns ra_ctx_drm_egl = {
     .type           = "opengl",
     .name           = "drm",
+    .description    = "DRM/EGL",
     .reconfig       = drm_egl_reconfig,
     .control        = drm_egl_control,
     .init           = drm_egl_init,
diff --git a/video/out/opengl/context_dxinterop.c b/video/out/opengl/context_dxinterop.c
index cda696f71b..3ebdfbeaa0 100644
--- a/video/out/opengl/context_dxinterop.c
+++ b/video/out/opengl/context_dxinterop.c
@@ -598,6 +598,7 @@ static int dxgl_control(struct ra_ctx *ctx, int *events, int request,
 const struct ra_ctx_fns ra_ctx_dxgl = {
     .type         = "opengl",
     .name         = "dxinterop",
+    .description  = "WGL rendering/Direct3D 9Ex presentation",
     .init         = dxgl_init,
     .reconfig     = dxgl_reconfig,
     .control      = dxgl_control,
diff --git a/video/out/opengl/context_glx.c b/video/out/opengl/context_glx.c
index a2a63e137a..14f84d9dd7 100644
--- a/video/out/opengl/context_glx.c
+++ b/video/out/opengl/context_glx.c
@@ -342,6 +342,7 @@ static void glx_wait_events(struct ra_ctx *ctx, int64_t until_time_ns)
 const struct ra_ctx_fns ra_ctx_glx = {
     .type           = "opengl",
     .name           = "x11",
+    .description    = "X11/GLX",
     .reconfig       = glx_reconfig,
     .control        = glx_control,
     .wakeup         = glx_wakeup,
diff --git a/video/out/opengl/context_wayland.c b/video/out/opengl/context_wayland.c
index 2c5611b2e6..e091220349 100644
--- a/video/out/opengl/context_wayland.c
+++ b/video/out/opengl/context_wayland.c
@@ -220,6 +220,7 @@ static bool wayland_egl_init(struct ra_ctx *ctx)
 const struct ra_ctx_fns ra_ctx_wayland_egl = {
     .type               = "opengl",
     .name               = "wayland",
+    .description        = "Wayland/EGL",
     .reconfig           = wayland_egl_reconfig,
     .control            = wayland_egl_control,
     .wakeup             = wayland_egl_wakeup,
diff --git a/video/out/opengl/context_win.c b/video/out/opengl/context_win.c
index a582e2834e..69458218f8 100644
--- a/video/out/opengl/context_win.c
+++ b/video/out/opengl/context_win.c
@@ -380,6 +380,7 @@ static void wgl_update_render_opts(struct ra_ctx *ctx)
 const struct ra_ctx_fns ra_ctx_wgl = {
     .type               = "opengl",
     .name               = "win",
+    .description        = "Win32/WGL",
     .init               = wgl_init,
     .reconfig           = wgl_reconfig,
     .control            = wgl_control,
diff --git a/video/out/opengl/context_x11egl.c b/video/out/opengl/context_x11egl.c
index 3201f298f6..e5885b6106 100644
--- a/video/out/opengl/context_x11egl.c
+++ b/video/out/opengl/context_x11egl.c
@@ -216,6 +216,7 @@ static void mpegl_wait_events(struct ra_ctx *ctx, int64_t until_time_ns)
 const struct ra_ctx_fns ra_ctx_x11_egl = {
     .type           = "opengl",
     .name           = "x11egl",
+    .description    = "X11/EGL",
     .reconfig       = mpegl_reconfig,
     .control        = mpegl_control,
     .wakeup         = mpegl_wakeup,