videomixer: Avoid double free of VideoConvert

https://bugzilla.gnome.org/show_bug.cgi?id=734764
This commit is contained in:
Ravi Kiran K N 2014-08-14 11:29:00 +05:30 committed by Sebastian Dröge
parent 6ee2665b7c
commit 61fe02a018

View file

@ -2119,6 +2119,7 @@ gst_videomixer2_release_pad (GstElement * element, GstPad * pad)
if (mixpad->convert) if (mixpad->convert)
videomixer_videoconvert_convert_free (mixpad->convert); videomixer_videoconvert_convert_free (mixpad->convert);
mixpad->convert = NULL;
mix->sinkpads = g_slist_remove (mix->sinkpads, pad); mix->sinkpads = g_slist_remove (mix->sinkpads, pad);
gst_child_proxy_child_removed (GST_CHILD_PROXY (mix), G_OBJECT (mixpad), gst_child_proxy_child_removed (GST_CHILD_PROXY (mix), G_OBJECT (mixpad),
@ -2167,6 +2168,7 @@ gst_videomixer2_dispose (GObject * o)
if (mixpad->convert) if (mixpad->convert)
videomixer_videoconvert_convert_free (mixpad->convert); videomixer_videoconvert_convert_free (mixpad->convert);
mixpad->convert = NULL;
} }
if (mix->pending_tags) { if (mix->pending_tags) {