summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gst/smpte/gstsmpte.c10
2 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bebcfa5e..7b85ec25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-01-18 Tim-Philipp Müller <tim at centricular dot net>
+ * gst/smpte/gstsmpte.c: (gst_smpte_init):
+ Proxy getcaps on sink pads too, so that we either end up with the
+ same dimensions on all pads or error out if that's not possible
+ (seems to work even!). Fixes #398086, I think.
+
+2007-01-18 Tim-Philipp Müller <tim at centricular dot net>
+
* docs/plugins/gst-plugins-good-plugins-docs.sgml:
* docs/plugins/gst-plugins-good-plugins.args:
* docs/plugins/gst-plugins-good-plugins.hierarchy:
diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index de02ac6c..eceb3587 100644
--- a/gst/smpte/gstsmpte.c
+++ b/gst/smpte/gstsmpte.c
@@ -322,12 +322,18 @@ gst_smpte_init (GstSMPTE * smpte)
{
smpte->sinkpad1 =
gst_pad_new_from_static_template (&gst_smpte_sink1_template, "sink1");
- gst_pad_set_setcaps_function (smpte->sinkpad1, gst_smpte_setcaps);
+ gst_pad_set_setcaps_function (smpte->sinkpad1,
+ GST_DEBUG_FUNCPTR (gst_smpte_setcaps));
+ gst_pad_set_getcaps_function (smpte->sinkpad1,
+ GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps));
gst_element_add_pad (GST_ELEMENT (smpte), smpte->sinkpad1);
smpte->sinkpad2 =
gst_pad_new_from_static_template (&gst_smpte_sink2_template, "sink2");
- gst_pad_set_setcaps_function (smpte->sinkpad2, gst_smpte_setcaps);
+ gst_pad_set_setcaps_function (smpte->sinkpad2,
+ GST_DEBUG_FUNCPTR (gst_smpte_setcaps));
+ gst_pad_set_getcaps_function (smpte->sinkpad2,
+ GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps));
gst_element_add_pad (GST_ELEMENT (smpte), smpte->sinkpad2);
smpte->srcpad =