mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-28 19:20:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsmux: fix release_pad

Browse source 
Remove bogus freeing of pad element_private data that we
never set (collectpads uses it, which causes confusion here).
Also, check that our collectpads instance exists before using
it.  Partial fix for #636011.
This commit is contained in:
David Schleef 2010-12-04 19:55:32 -08:00
parent 92d5ea2926
commit 455aaa3fbd
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/mpegtsmux/mpegtsmux.c
View file

@ -800,28 +800,15 @@ static void
mpegtsmux_release_pad (GstElement * element, GstPad * pad)
{
MpegTsMux *mux = GST_MPEG_TSMUX (element);
MpegTsPadData *pad_data = NULL;
GST_DEBUG_OBJECT (mux, "Pad %" GST_PTR_FORMAT " being released", pad);
/* Get the MpegTsPadData out of the pad */
GST_OBJECT_LOCK (pad);
pad_data = (MpegTsPadData *) gst_pad_get_element_private (pad);
if (G_LIKELY (pad_data)) {
/* Free codec data reference if any */
if (pad_data->codec_data) {
GST_DEBUG_OBJECT (element, "releasing codec_data reference");
gst_buffer_unref (pad_data->codec_data);
pad_data->codec_data = NULL;
}
if (pad_data->prepare_data && pad_data->free_func) {
pad_data->free_func (pad_data->prepare_data);
pad_data->prepare_data = pad_data->free_func = NULL;
}
if (mux->collect) {
gst_collect_pads_remove_pad (mux->collect, pad);
}
GST_OBJECT_UNLOCK (pad);
gst_collect_pads_remove_pad (mux->collect, pad);
/* chain up */
gst_element_remove_pad (element, pad);
}
static gboolean