From f547336fdc8a34738c3e6fac9f1e124f59169fd7 Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Tue, 31 Jan 2012 08:44:04 +0100 Subject: mpegtsmux: update after collectpads2 changes --- gst/mpegtsmux/mpegtsmux.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'gst/mpegtsmux') diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c index 4de290f2e..bab4a873d 100644 --- a/gst/mpegtsmux/mpegtsmux.c +++ b/gst/mpegtsmux/mpegtsmux.c @@ -663,27 +663,6 @@ mpegtsmux_choose_best_stream (MpegTsMux * mux) #define COLLECT_DATA_PAD(collect_data) (((GstCollectData2 *)(collect_data))->pad) -static MpegTsPadData * -find_pad_data (MpegTsMux * mux, GstPad * pad) -{ - GSList *walk; - MpegTsPadData *ts_data = NULL; - - GST_COLLECT_PADS2_STREAM_LOCK (mux->collect); - walk = mux->collect->pad_list; - while (walk) { - if (((GstCollectData2 *) walk->data)->pad == pad) { - ts_data = (MpegTsPadData *) walk->data; - break; - } - - walk = g_slist_next (walk); - } - GST_COLLECT_PADS2_STREAM_UNLOCK (mux->collect); - - return ts_data; -} - static gboolean mpegtsmux_sink_event (GstPad * pad, GstEvent * event) { @@ -692,7 +671,7 @@ mpegtsmux_sink_event (GstPad * pad, GstEvent * event) gboolean res = TRUE; gboolean forward = TRUE; - ts_data = find_pad_data (mux, pad); + ts_data = (MpegTsPadData *) gst_pad_get_element_private (pad); switch (GST_EVENT_TYPE (event)) { case GST_EVENT_CUSTOM_DOWNSTREAM: -- cgit v1.2.1