Revert "Check that collectpads exists before removing pad"

This reverts commit 8e6b876e76c94410db160afe5eb30f21452e419f.

Depends on a core commit that was reverted

diff --git a/ext/cairo/gsttextoverlay.c b/ext/cairo/gsttextoverlay.c
index 90e81a5..364b8ba 100644 (file)
--- a/ext/cairo/gsttextoverlay.c
+++ b/ext/cairo/gsttextoverlay.c
@@ -208,7 +208,6 @@ gst_text_overlay_finalize (GObject * object)
 
   gst_collect_pads_stop (overlay->collect);
   gst_object_unref (overlay->collect);
-  overlay->collect = NULL;
 
   g_free (overlay->text_fill_image);
   g_free (overlay->text_outline_image);
@@ -632,9 +631,7 @@ gst_text_overlay_text_pad_unlinked (GstPad * pad)
   GST_DEBUG_OBJECT (overlay, "Text pad unlinked");
 
   if (overlay->text_collect_data) {
-    if (overlay->collect) {
-      gst_collect_pads_remove_pad (overlay->collect, overlay->text_sinkpad);
-    }
+    gst_collect_pads_remove_pad (overlay->collect, overlay->text_sinkpad);
     overlay->text_collect_data = NULL;
   }
 

diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 1a8e576..d0d2f0e 100644 (file)
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -285,7 +285,6 @@ gst_avi_mux_finalize (GObject * object)
   mux->idx = NULL;
 
   gst_object_unref (mux->collect);
-  mux->collect = NULL;
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -1090,9 +1089,7 @@ gst_avi_mux_release_pad (GstElement * element, GstPad * pad)
        * as it also represent number of streams present */
       avipad->collect = NULL;
       GST_DEBUG_OBJECT (avimux, "removed pad '%s'", GST_PAD_NAME (pad));
-      if (avimux->collect) {
-        gst_collect_pads_remove_pad (avimux->collect, pad);
-      }
+      gst_collect_pads_remove_pad (avimux->collect, pad);
       gst_element_remove_pad (element, pad);
       /* if not started yet, we can remove any sign this pad ever existed */
       /* in this case _start will take care of the real pad count */

diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c
index 9d69ace..68a0df4 100644 (file)
--- a/gst/flv/gstflvmux.c
+++ b/gst/flv/gstflvmux.c
@@ -207,7 +207,6 @@ gst_flv_mux_finalize (GObject * object)
   GstFlvMux *mux = GST_FLV_MUX (object);
 
   gst_object_unref (mux->collect);
-  mux->collect = NULL;
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -560,9 +559,7 @@ gst_flv_mux_release_pad (GstElement * element, GstPad * pad)
   if (cpad && cpad->video_codec_data)
     gst_buffer_unref (cpad->video_codec_data);
 
-  if (mux->collect) {
-    gst_collect_pads_remove_pad (mux->collect, pad);
-  }
+  gst_collect_pads_remove_pad (mux->collect, pad);
   gst_element_remove_pad (element, pad);
 }
 

diff --git a/gst/interleave/interleave.c b/gst/interleave/interleave.c
index f6ff41a..96a43c8 100644 (file)
--- a/gst/interleave/interleave.c
+++ b/gst/interleave/interleave.c
@@ -598,9 +598,7 @@ gst_interleave_release_pad (GstElement * element, GstPad * pad)
 
   GST_OBJECT_UNLOCK (self->collect);
 
-  if (self->collect) {
-    gst_collect_pads_remove_pad (self->collect, pad);
-  }
+  gst_collect_pads_remove_pad (self->collect, pad);
   gst_element_remove_pad (element, pad);
 }
 

diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 6d2cc5d..31fe40b 100644 (file)
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -385,7 +385,6 @@ gst_matroska_mux_finalize (GObject * object)
   GstMatroskaMux *mux = GST_MATROSKA_MUX (object);
 
   gst_object_unref (mux->collect);
-  mux->collect = NULL;
   gst_object_unref (mux->ebml_write);
   if (mux->writing_app)
     g_free (mux->writing_app);
@@ -1930,9 +1929,7 @@ gst_matroska_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);
   if (gst_element_remove_pad (element, pad))
     mux->num_streams--;
 }

diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index 925b06c..1271d63 100644 (file)
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -777,7 +777,6 @@ gst_videomixer_finalize (GObject * object)
   GstVideoMixer *mix = GST_VIDEO_MIXER (object);
 
   gst_object_unref (mix->collect);
-  mix->collect = NULL;
   g_mutex_free (mix->state_lock);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -1252,9 +1251,7 @@ gst_videomixer_release_pad (GstElement * element, GstPad * pad)
 
   mix->sinkpads = g_slist_remove (mix->sinkpads, pad);
   gst_videomixer_collect_free (mixpad->mixcol);
-  if (mix->collect) {
-    gst_collect_pads_remove_pad (mix->collect, pad);
-  }
+  gst_collect_pads_remove_pad (mix->collect, pad);
   gst_child_proxy_child_removed (GST_OBJECT (mix), GST_OBJECT (mixpad));
   /* determine possibly new geometry and master */
   gst_videomixer_set_master_geometry (mix);