From bebe2707138b5684404f9e103381c3c544dcf326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 19 Jan 2008 16:04:14 +0000 Subject: [PATCH] ext/mad/gstid3tag.c: Don't add pad templates for the base class but only in the subclasses. Original commit message from CVS: * ext/mad/gstid3tag.c: (gst_id3_tag_class_init): Don't add pad templates for the base class but only in the subclasses. --- ChangeLog | 6 ++++++ common | 2 +- ext/mad/gstid3tag.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b843ef758..901cf37888 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-19 Sebastian Dröge + + * ext/mad/gstid3tag.c: (gst_id3_tag_class_init): + Don't add pad templates for the base class but only in the + subclasses. + 2008-01-17 Zaheer Abbas Merali * ext/lame/gstlame.c: diff --git a/common b/common index 0efbab89d3..b6bd1a35b6 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 0efbab89d333b5d07cc7da1a501c38edf5bb4f72 +Subproject commit b6bd1a35b641237d016496039e474dee4230de76 diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c index 5c4c62f9f6..f703e5bb05 100644 --- a/ext/mad/gstid3tag.c +++ b/ext/mad/gstid3tag.c @@ -285,7 +285,7 @@ gst_id3_tag_class_init (gpointer g_class, gpointer class_data) G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&id3_tag_src_any_template_factory)); - } else { + } else if (tag_class->type & GST_ID3_TAG_PARSE_MUX) { gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&id3_tag_src_id3_template_factory)); } @@ -303,7 +303,7 @@ gst_id3_tag_class_init (gpointer g_class, gpointer class_data) if (tag_class->type == GST_ID3_TAG_PARSE_MUX) { gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&id3_tag_sink_any_template_factory)); - } else { + } else if (tag_class->type & GST_ID3_TAG_PARSE_DEMUX) { gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&id3_tag_sink_id3_template_factory)); }