Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2012-03-22 11:55:28 +01:00
commit 7c9a54aa07

View file

@ -363,7 +363,6 @@ gst_smpte_init (GstSMPTE * smpte)
smpte->collect = gst_collect_pads2_new ();
gst_collect_pads2_set_function (smpte->collect,
(GstCollectPads2Function) GST_DEBUG_FUNCPTR (gst_smpte_collected), smpte);
gst_collect_pads2_start (smpte->collect);
gst_collect_pads2_add_pad (smpte->collect, smpte->sinkpad1,
sizeof (GstCollectData2));