From 3054bcc62c04f8d360aba3c6f24982e78b25bcb0 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sun, 20 Sep 2020 12:04:25 +0200
Subject: options: simplify --android-surface-size handling

---
 options/options.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'options/options.c')

diff --git a/options/options.c b/options/options.c
index 1f6f943fdc..88b78565ed 100644
--- a/options/options.c
+++ b/options/options.c
@@ -92,7 +92,6 @@ extern const struct m_sub_options d3d11va_conf;
 extern const struct m_sub_options angle_conf;
 extern const struct m_sub_options cocoa_conf;
 extern const struct m_sub_options macos_conf;
-extern const struct m_sub_options android_conf;
 extern const struct m_sub_options wayland_conf;
 extern const struct m_sub_options vaapi_conf;
 
@@ -166,6 +165,9 @@ static const m_option_t mp_vo_opt_list[] = {
 #endif
 #if HAVE_DRM
     {"", OPT_SUBSTRUCT(drm_opts, drm_conf)},
+#endif
+#if HAVE_EGL_ANDROID
+    {"android-surface-size", OPT_SIZE_BOX(android_surface_size)},
 #endif
     {"swapchain-depth", OPT_INT(swapchain_depth), M_RANGE(1, 8)},
     {0}
@@ -784,10 +786,6 @@ static const m_option_t mp_opts[] = {
     {"", OPT_SUBSTRUCT(macos_opts, macos_conf)},
 #endif
 
-#if HAVE_EGL_ANDROID
-    {"", OPT_SUBSTRUCT(android_opts, android_conf)},
-#endif
-
 #if HAVE_WAYLAND
     {"", OPT_SUBSTRUCT(wayland_opts, wayland_conf)},
 #endif
-- 
cgit v1.2.3