summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2007-01-18 18:37:39 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-01-18 18:37:39 +0000
commit914b79faa6ee937962b5433d0d7906b41c1c46be (patch)
treee78d7e40663c86b36efcc54fae1a2c9c60490d4c
parentfe266ffd42325ceb2ada8d30d7b7d0317119f036 (diff)
gst/smpte/gstsmpte.c: Proxy getcaps on sink pads too, so that we either end up with the same dimensions on all pads o...
Original commit message from CVS: * 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.
-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 =