[vlc-commits] opengl: fix vdpau GLX usage

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Mar 13 16:46:09 2018 +0100| [9ed1d80027eb5472d28de209b54a440a61646f58] | committer: Thomas Guillem

opengl: fix vdpau GLX usage

Indeed, this variable can be "any" if it was previously reset from preference
settings.

(cherry picked from commit 6cc83a000bdb1509b09a608dc4c342dac7fb0bfd)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

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

 modules/video_output/opengl/display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_output/opengl/display.c b/modules/video_output/opengl/display.c
index a681760df2..ec671109bc 100644
--- a/modules/video_output/opengl/display.c
+++ b/modules/video_output/opengl/display.c
@@ -119,7 +119,7 @@ static int Open (vlc_object_t *obj)
             {
                 /* Force the option only if it was not previously set */
                 char *str = var_InheritString(surface, MODULE_VARNAME);
-                if (str == NULL)
+                if (str == NULL || str[0] == 0 || strcmp(str, "any") == 0)
                     gl_name = "glx";
                 free(str);
                 break;