summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2017-08-01 17:59:38 +0200
committerVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2017-08-01 17:59:38 +0200
commit02e48ad8dc3f31971786addb795d54851ff2360c (patch)
tree67bec4d226c4ef0b89c3d520100a938bfe40d67e
parentde0f8936f82ef6cdede02299def8a50993fe92c7 (diff)
plugins: avoid dead code detection
By using #elif macro, the static code analysis would stop to detect these lines as dead code. Also it is inforced the mutually exclusive environments.
-rw-r--r--gst/vaapi/gstvaapipluginutil.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c
index e9ff8b6e..c38334fc 100644
--- a/gst/vaapi/gstvaapipluginutil.c
+++ b/gst/vaapi/gstvaapipluginutil.c
@@ -180,8 +180,7 @@ gst_vaapi_create_display_from_gl_context (GstObject * gl_context_object)
#if USE_X11 && GST_GL_HAVE_WINDOW_X11
if (!display_type)
display_type = GST_VAAPI_DISPLAY_TYPE_X11;
-#endif
-#if USE_WAYLAND && GST_GL_HAVE_WINDOW_WAYLAND
+#elif USE_WAYLAND && GST_GL_HAVE_WINDOW_WAYLAND
if (!display_type)
display_type = GST_VAAPI_DISPLAY_TYPE_WAYLAND;
#endif