mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "Check that collectpads exists before removing pad"

Browse source 
This reverts commit 6d8740476c.

Depends on a core commit that was reverted
This commit is contained in:
Edward Hervey 2011-02-21 12:14:59 +01:00
parent 6d8740476c
commit 715529c963
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/mpegpsmux/mpegpsmux.c
View file

@ -588,9 +588,7 @@ mpegpsmux_release_pad (GstElement * element, GstPad * pad)
} }
GST_OBJECT_UNLOCK (pad); GST_OBJECT_UNLOCK (pad);
if (mux->collect) { gst_collect_pads_remove_pad (mux->collect, pad);
gst_collect_pads_remove_pad (mux->collect, pad);
}
} }
static gboolean static gboolean

5
gst/qtmux/gstqtmux.c
View file

@ -503,7 +503,6 @@ gst_qt_mux_finalize (GObject * object)
atoms_context_free (qtmux->context); atoms_context_free (qtmux->context);
gst_object_unref (qtmux->collect); gst_object_unref (qtmux->collect);
qtmux->collect = NULL;
g_slist_free (qtmux->sinkpads); g_slist_free (qtmux->sinkpads);
@ -3166,9 +3165,7 @@ gst_qt_mux_release_pad (GstElement * element, GstPad * pad)
} }
} }
if (mux->collect) { gst_collect_pads_remove_pad (mux->collect, pad);
gst_collect_pads_remove_pad (mux->collect, pad);
}
} }
static GstPad * static GstPad *

4
gst/videomeasure/gstvideomeasure_ssim.c
View file

@ -1253,9 +1253,7 @@ gst_ssim_release_pad (GstElement * element, GstPad * pad)
GST_DEBUG_OBJECT (ssim, "release pad %s:%s", GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_OBJECT (ssim, "release pad %s:%s", GST_DEBUG_PAD_NAME (pad));
if (ssim->collect) { gst_collect_pads_remove_pad (ssim->collect, pad);
gst_collect_pads_remove_pad (ssim->collect, pad);
}
gst_element_remove_pad (element, pad); gst_element_remove_pad (element, pad);
} }