summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2006-10-06 16:03:23 +0000
committerWim Taymans <wim.taymans@gmail.com>2006-10-06 16:03:23 +0000
commit09328ad0104734def11242b6c9d750845e92c5de (patch)
tree7734c3d895d129106c6bfce0ce760f4c568b4b83
parentedc2785eeb8304b58cd4122d9a228d093f6c1c79 (diff)
gst/multipart/multipartdemux.c: Activate pads before adding.
Original commit message from CVS: * gst/multipart/multipartdemux.c: (gst_multipart_demux_init), (gst_multipart_find_pad_by_mime): Activate pads before adding. * gst/rtp/gstrtpmp4vdepay.c: (gst_rtp_mp4v_depay_class_init): BOILERPLATE sets parent_class for us.
-rw-r--r--ChangeLog9
-rw-r--r--gst/multipart/multipartdemux.c5
-rw-r--r--gst/rtp/gstrtpmp4vdepay.c2
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e3acf01..f7de3cbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2006-10-06 Wim Taymans <wim@fluendo.com>
+ * gst/multipart/multipartdemux.c: (gst_multipart_demux_init),
+ (gst_multipart_find_pad_by_mime):
+ Activate pads before adding.
+
+ * gst/rtp/gstrtpmp4vdepay.c: (gst_rtp_mp4v_depay_class_init):
+ BOILERPLATE sets parent_class for us.
+
+2006-10-06 Wim Taymans <wim@fluendo.com>
+
* gst/rtsp/gstrtspsrc.c: (gst_rtsp_proto_get_type),
(gst_rtspsrc_class_init), (gst_rtspsrc_init),
(gst_rtspsrc_create_stream), (gst_rtspsrc_media_to_caps),
diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c
index 7e8fbb88..b2a4fe69 100644
--- a/gst/multipart/multipartdemux.c
+++ b/gst/multipart/multipartdemux.c
@@ -220,7 +220,7 @@ gst_multipart_demux_init (GstMultipartDemux * multipart,
multipart->sinkpad =
gst_pad_new_from_template (gst_static_pad_template_get
(&multipart_demux_sink_template_factory), "sink");
- gst_element_add_pad (GST_ELEMENT (multipart), multipart->sinkpad);
+ gst_element_add_pad (GST_ELEMENT_CAST (multipart), multipart->sinkpad);
gst_pad_set_chain_function (multipart->sinkpad,
GST_DEBUG_FUNCPTR (gst_multipart_demux_chain));
@@ -290,7 +290,8 @@ gst_multipart_find_pad_by_mime (GstMultipartDemux * demux, gchar * mime,
demux->srcpads = g_slist_prepend (demux->srcpads, mppad);
demux->numpads++;
- gst_element_add_pad (GST_ELEMENT (demux), pad);
+ gst_pad_set_active (pad, TRUE);
+ gst_element_add_pad (GST_ELEMENT_CAST (demux), pad);
if (created) {
*created = TRUE;
diff --git a/gst/rtp/gstrtpmp4vdepay.c b/gst/rtp/gstrtpmp4vdepay.c
index aeeeaec4..b872325d 100644
--- a/gst/rtp/gstrtpmp4vdepay.c
+++ b/gst/rtp/gstrtpmp4vdepay.c
@@ -111,8 +111,6 @@ gst_rtp_mp4v_depay_class_init (GstRtpMP4VDepayClass * klass)
gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass;
- parent_class = g_type_class_peek_parent (klass);
-
gstbasertpdepayload_class->process = gst_rtp_mp4v_depay_process;
gstbasertpdepayload_class->set_caps = gst_rtp_mp4v_depay_setcaps;