mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

glmixerbin: slightly better pad/element creation

Browse source 
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>
This commit is contained in:
Matthew Waters 2022-03-27 16:35:14 +11:00 committed by GStreamer Marge Bot
parent 2e69886a02
commit b2232c5c9a
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
subprojects/gst-plugins-base/ext/gl/gstglmixerbin.c
View file

@ -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_convert);
res &= gst_bin_add (GST_BIN (self), chain->in_overlay); res &= gst_bin_add (GST_BIN (self), chain->in_overlay);
res &= gst_bin_add (GST_BIN (self), chain->upload); 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"); pad = gst_element_get_static_pad (chain->in_overlay, "src");
if (gst_pad_link (pad, mixer_pad) != GST_PAD_LINK_OK) { 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; return FALSE;
} }
gst_object_unref (pad); gst_object_unref (pad);
res &= if (!gst_element_link_pads (chain->in_convert, "src", chain->in_overlay,
gst_element_link_pads (chain->in_convert, "src", chain->in_overlay, "sink")) {
"sink"); g_warn_if_reached ();
res &= return FALSE;
gst_element_link_pads (chain->upload, "src", chain->in_convert, "sink"); }
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"); pad = gst_element_get_static_pad (chain->upload, "sink");
if (!pad) { if (!pad) {