[0.11] gst-plugins-bad: mpegtsmux: update after collectpads2 changes
Wim Taymans
wtay at kemper.freedesktop.org
Fri Feb 10 07:47:17 PST 2012
Module: gst-plugins-bad
Branch: 0.11
Commit: f547336fdc8a34738c3e6fac9f1e124f59169fd7
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=f547336fdc8a34738c3e6fac9f1e124f59169fd7
Author: Alessandro Decina <alessandro.d at gmail.com>
Date: Tue Jan 31 08:44:04 2012 +0100
mpegtsmux: update after collectpads2 changes
---
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 4de290f..bab4a87 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:
More information about the gstreamer-commits
mailing list