gst/gstghostpad.c: Activating a ghostpad with no internal pad in push mode is ok.

Original commit message from CVS:
* gst/gstghostpad.c: (gst_ghost_pad_get_internal),
(gst_ghost_pad_do_activate_push):
Activating a ghostpad with no internal pad in push mode
is ok.

diff --git a/ChangeLog b/ChangeLog
index 28310a8..54214b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-07  Wim Taymans  <wim@fluendo.com>
+
+       * gst/gstghostpad.c: (gst_ghost_pad_get_internal),
+       (gst_ghost_pad_do_activate_push):
+       Activating a ghostpad with no internal pad in push mode
+       is ok.
+
 2005-10-07  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * gst/gstobject.h:

diff --git a/gst/gstghostpad.c b/gst/gstghostpad.c
index 91cbca1..efd21d3 100644 (file)
--- a/gst/gstghostpad.c
+++ b/gst/gstghostpad.c
@@ -463,7 +463,8 @@ gst_ghost_pad_get_internal (GstPad * pad)
 
   GST_PROXY_LOCK (pad);
   internal = GST_GHOST_PAD (pad)->internal;
-  gst_object_ref (internal);
+  if (internal)
+    gst_object_ref (internal);
   GST_PROXY_UNLOCK (pad);
 
   return internal;
@@ -552,7 +553,7 @@ gst_ghost_pad_do_activate_push (GstPad * pad, gboolean active)
       ret = gst_pad_activate_push (internal, active);
       gst_object_unref (internal);
     } else {
-      ret = FALSE;
+      ret = TRUE;
     }
   } else {
     ret = TRUE;