diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-02-21 12:09:07 +0100 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-02-21 12:25:19 +0100 |
| commit | 6e1c70150212a718302c882dded00a41dee56eb3 (patch) | |
| tree | 59f6c54abdc7e302d2cfc2e66af6e6e9a4003aae /ext/cairo | |
| parent | 06972db7b6a55f951833327a659afc76bef6b5c8 (diff) | |
Revert "Check that collectpads exists before removing pad"
This reverts commit 8e6b876e76c94410db160afe5eb30f21452e419f.
Depends on a core commit that was reverted
Diffstat (limited to 'ext/cairo')
| -rw-r--r-- | ext/cairo/gsttextoverlay.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/cairo/gsttextoverlay.c b/ext/cairo/gsttextoverlay.c index 90e81a5bd..364b8bae9 100644 --- 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; } |