From 16f37f8b9c195c929ec29fa782cc267cb7cb8c40 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Fri, 4 Mar 2022 22:21:13 +0900 Subject: [PATCH] gldisplay: Reorder GST_GL_WINDOW check for egl-device "egl-device" should be checked before the "egl", otherwise unexpected egl will be picked Part-of: --- subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c index 270d215..08c369c 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c @@ -302,14 +302,14 @@ gst_gl_display_type_from_environment (void) return GST_GL_DISPLAY_TYPE_WIN32; } else if (g_strstr_len (env, 8, "dispmanx")) { return GST_GL_DISPLAY_TYPE_DISPMANX; + } else if (g_strstr_len (env, 10, "egl-device")) { + return GST_GL_DISPLAY_TYPE_EGL_DEVICE; } else if (g_strstr_len (env, 3, "egl")) { return GST_GL_DISPLAY_TYPE_EGL; } else if (g_strstr_len (env, 6, "viv-fb")) { return GST_GL_DISPLAY_TYPE_VIV_FB; } else if (g_strstr_len (env, 3, "gbm")) { return GST_GL_DISPLAY_TYPE_GBM; - } else if (g_strstr_len (env, 10, "egl-device")) { - return GST_GL_DISPLAY_TYPE_EGL_DEVICE; } else if (g_strstr_len (env, 4, "eagl")) { return GST_GL_DISPLAY_TYPE_EAGL; } else if (g_strstr_len (env, 7, "android")) { -- 2.7.4