summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-05-14 20:57:31 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-05-14 20:57:31 +0000
commitaffa2929519cee158d1c59853d6f286e54419f37 (patch)
tree191aaa8537738773e4bc518f893cca688b892906
parentbfd70466939298a2d3b9ed8f6f3283b3ce7dc8e2 (diff)
downloadgst-plugins-bad-affa2929519cee158d1c59853d6f286e54419f37.tar.gz
gst-plugins-bad-affa2929519cee158d1c59853d6f286e54419f37.tar.bz2
gst-plugins-bad-affa2929519cee158d1c59853d6f286e54419f37.zip
gst/mpeg4videoparse/mpeg4videoparse.c: Set fixed caps on the srcpad after we created the pad...
Original commit message from CVS: * gst/mpeg4videoparse/mpeg4videoparse.c: (gst_mpeg4vparse_init): Set fixed caps on the srcpad after we created the pad...
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--gst/mpeg4videoparse/mpeg4videoparse.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e22b890e..3546af54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-14 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * gst/mpeg4videoparse/mpeg4videoparse.c: (gst_mpeg4vparse_init):
+ Set fixed caps on the srcpad after we created the pad...
+
2008-05-14 Tim-Philipp Müller <tim.muller at collabora co uk>
* tests/check/Makefile.am:
diff --git a/common b/common
-Subproject d78efae300d4dff0291717ccf7a2b82c713a81e
+Subproject 0823ac6b46b7332109bbc5f1ef40e24e648fae5
diff --git a/gst/mpeg4videoparse/mpeg4videoparse.c b/gst/mpeg4videoparse/mpeg4videoparse.c
index e845ec88..fc43f014 100644
--- a/gst/mpeg4videoparse/mpeg4videoparse.c
+++ b/gst/mpeg4videoparse/mpeg4videoparse.c
@@ -798,12 +798,12 @@ gst_mpeg4vparse_init (GstMpeg4VParse * parse, GstMpeg4VParseClass * g_class)
GST_DEBUG_FUNCPTR (gst_mpeg4vparse_sink_event));
gst_pad_set_setcaps_function (parse->sinkpad,
GST_DEBUG_FUNCPTR (gst_mpeg4vparse_sink_setcaps));
- gst_pad_use_fixed_caps (parse->srcpad);
gst_element_add_pad (GST_ELEMENT (parse), parse->sinkpad);
parse->srcpad = gst_pad_new_from_static_template (&src_template, "src");
gst_pad_set_query_function (parse->srcpad,
GST_DEBUG_FUNCPTR (gst_mpeg4vparse_src_query));
+ gst_pad_use_fixed_caps (parse->srcpad);
gst_element_add_pad (GST_ELEMENT (parse), parse->srcpad);
parse->adapter = gst_adapter_new ();