gst-plugins-good: multipartdemux: first activate pad then set caps
Wim Taymans
wtay at kemper.freedesktop.org
Fri Apr 20 07:50:28 PDT 2012
Module: gst-plugins-good
Branch: master
Commit: ad5c3cd3dd333db0857af43887c483859a32bf19
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=ad5c3cd3dd333db0857af43887c483859a32bf19
Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date: Fri Apr 20 16:49:56 2012 +0200
multipartdemux: first activate pad then set caps
---
gst/multipart/multipartdemux.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c
index 2087552..ab9dacb 100644
--- a/gst/multipart/multipartdemux.c
+++ b/gst/multipart/multipartdemux.c
@@ -313,14 +313,6 @@ gst_multipart_find_pad_by_mime (GstMultipartDemux * demux, gchar * mime,
name);
g_free (name);
- /* take the mime type, convert it to the caps name */
- capsname = gst_multipart_demux_get_gstname (demux, mime);
- caps = gst_caps_from_string (capsname);
- GST_DEBUG_OBJECT (demux, "caps for pad: %s", capsname);
- gst_pad_use_fixed_caps (pad);
- gst_pad_set_caps (pad, caps);
- gst_caps_unref (caps);
-
mppad->pad = pad;
mppad->mime = g_strdup (mime);
mppad->last_ret = GST_FLOW_OK;
@@ -328,7 +320,15 @@ gst_multipart_find_pad_by_mime (GstMultipartDemux * demux, gchar * mime,
demux->srcpads = g_slist_prepend (demux->srcpads, mppad);
demux->numpads++;
+ /* take the mime type, convert it to the caps name */
+ capsname = gst_multipart_demux_get_gstname (demux, mime);
+ caps = gst_caps_from_string (capsname);
+ GST_DEBUG_OBJECT (demux, "caps for pad: %s", capsname);
+ gst_pad_use_fixed_caps (pad);
gst_pad_set_active (pad, TRUE);
+ gst_pad_set_caps (pad, caps);
+ gst_caps_unref (caps);
+
gst_element_add_pad (GST_ELEMENT_CAST (demux), pad);
if (created) {
More information about the gstreamer-commits
mailing list