diff options
| author | Alessandro Decina <alessandro.d@gmail.com> | 2012-01-31 08:44:04 +0100 |
|---|---|---|
| committer | Alessandro Decina <alessandro.d@gmail.com> | 2012-01-31 08:44:04 +0100 |
| commit | f547336fdc8a34738c3e6fac9f1e124f59169fd7 (patch) | |
| tree | 3a93d31b73a392a7d254cf8f15c3a6f9e7a7d3b1 /gst/mpegtsmux | |
| parent | 4964db6a1cdf6f391943a2d69856b904ef001c29 (diff) | |
| download | gstreamer-plugins-bad-f547336fdc8a34738c3e6fac9f1e124f59169fd7.tar.gz | |
mpegtsmux: update after collectpads2 changes
Diffstat (limited to 'gst/mpegtsmux')
| -rw-r--r-- | gst/mpegtsmux/mpegtsmux.c | 23 |
1 files changed, 1 insertions, 22 deletions
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: |