[vlc-commits] gl: add add_glconv() define

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Sep 26 19:01:10 2017 +0200| [d51c133d51b3bf91081534350ff6a429b7291f3d] | committer: Thomas Guillem

gl: add add_glconv() define

Common module option to choose the OpenGL converter.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d51c133d51b3bf91081534350ff6a429b7291f3d
---

 modules/video_output/opengl/display.c     | 7 +------
 modules/video_output/opengl/vout_helper.h | 5 +++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/opengl/display.c b/modules/video_output/opengl/display.c
index ceb5ea204f..d04e4fba39 100644
--- a/modules/video_output/opengl/display.c
+++ b/modules/video_output/opengl/display.c
@@ -42,10 +42,6 @@ static void Close (vlc_object_t *);
 #define PROVIDER_LONGTEXT N_( \
     "Extension through which to use the Open Graphics Library (OpenGL).")
 
-#define GLCONV_TEXT N_("Open GL/GLES hardware converter")
-#define GLCONV_LONGTEXT N_( \
-    "Force a \"glconv\" module.")
-
 vlc_module_begin ()
 #if defined (USE_OPENGL_ES2)
 # define API VLC_OPENGL_ES2
@@ -72,8 +68,7 @@ vlc_module_begin ()
     add_module ("gl", "opengl", NULL,
                 GL_TEXT, PROVIDER_LONGTEXT, true)
 #endif
-    add_module ("glconv", NULL, NULL,
-                GLCONV_TEXT, GLCONV_LONGTEXT, true)
+    add_glconv ()
 vlc_module_end ()
 
 struct vout_display_sys_t
diff --git a/modules/video_output/opengl/vout_helper.h b/modules/video_output/opengl/vout_helper.h
index bb726991b2..abb196897e 100644
--- a/modules/video_output/opengl/vout_helper.h
+++ b/modules/video_output/opengl/vout_helper.h
@@ -58,6 +58,11 @@
 # endif
 #endif
 
+#define GLCONV_TEXT N_("Open GL/GLES hardware converter")
+#define GLCONV_LONGTEXT N_( \
+    "Force a \"glconv\" module.")
+#define add_glconv() add_module ("glconv", NULL, NULL, GLCONV_TEXT, GLCONV_LONGTEXT, true)
+
 static const vlc_fourcc_t gl_subpicture_chromas[] = {
     VLC_CODEC_RGBA,
     0