From: Matthew Waters <matthew@centricular.com>
Date: Sun, 27 Mar 2022 05:35:14 +0000 (+1100)
Subject: glmixerbin: slightly better pad/element creation
X-Git-Tag: 1.22.0~2030
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2232c5c9a1188c700ce5057765ef0335ae19b27;p=platform%2Fupstream%2Fgstreamer.git

glmixerbin: slightly better pad/element creation

Use the return value from gst_element_link_pads() and gst_bin_add()

Fixes:

../ext/gl/gstglmixerbin.c:305:12: error: variable 'res' set but not used [-Werror,-Wunused-but-set-variable]
  gboolean res = TRUE;
           ^

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2038>
---

diff --git a/subprojects/gst-plugins-base/ext/gl/gstglmixerbin.c b/subprojects/gst-plugins-base/ext/gl/gstglmixerbin.c
index e5c4d23..591e659 100644
--- a/subprojects/gst-plugins-base/ext/gl/gstglmixerbin.c
+++ b/subprojects/gst-plugins-base/ext/gl/gstglmixerbin.c
@@ -315,6 +315,10 @@ _create_input_chain (GstGLMixerBin * self, struct input_chain *chain,
   res &= gst_bin_add (GST_BIN (self), chain->in_convert);
   res &= gst_bin_add (GST_BIN (self), chain->in_overlay);
   res &= gst_bin_add (GST_BIN (self), chain->upload);
+  if (!res) {
+    g_warn_if_reached ();
+    return FALSE;
+  }
 
   pad = gst_element_get_static_pad (chain->in_overlay, "src");
   if (gst_pad_link (pad, mixer_pad) != GST_PAD_LINK_OK) {
@@ -322,11 +326,15 @@ _create_input_chain (GstGLMixerBin * self, struct input_chain *chain,
     return FALSE;
   }
   gst_object_unref (pad);
-  res &=
-      gst_element_link_pads (chain->in_convert, "src", chain->in_overlay,
-      "sink");
-  res &=
-      gst_element_link_pads (chain->upload, "src", chain->in_convert, "sink");
+  if (!gst_element_link_pads (chain->in_convert, "src", chain->in_overlay,
+          "sink")) {
+    g_warn_if_reached ();
+    return FALSE;
+  }
+  if (!gst_element_link_pads (chain->upload, "src", chain->in_convert, "sink")) {
+    g_warn_if_reached ();
+    return FALSE;
+  }
 
   pad = gst_element_get_static_pad (chain->upload, "sink");
   if (!pad) {