From b2c0b3a162f6ab178698c967c133ae3ba15b3525 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Wed, 24 Aug 2005 11:36:49 +0000 Subject: [PATCH] gst/gstpad.c (gst_pad_fixate_caps): Check if the caps is fixed already. Original commit message from CVS: 2005-08-24 Andy Wingo * gst/gstpad.c (gst_pad_fixate_caps): Check if the caps is fixed already. --- ChangeLog | 5 +++++ docs/gst/tmpl/gstutils.sgml | 4 ++++ gst/gstpad.c | 3 +++ 3 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index f36a1ad..53e555e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-24 Andy Wingo + + * gst/gstpad.c (gst_pad_fixate_caps): Check if the caps is fixed + already. + 2005-08-24 Wim Taymans * gst/gstbuffer.c: (gst_buffer_new_and_alloc): diff --git a/docs/gst/tmpl/gstutils.sgml b/docs/gst/tmpl/gstutils.sgml index 08bde28..890f0bf 100644 --- a/docs/gst/tmpl/gstutils.sgml +++ b/docs/gst/tmpl/gstutils.sgml @@ -92,6 +92,8 @@ various utility functions @\ parent_type_as_macro: @\ + parent_type_as_macro: +@\ parent_type_as_macro: @interface_type: @interface_type_as_macro: @@ -106,6 +108,8 @@ various utility functions @\ interface_as_function: @\ + interface_as_function: +@\ interface_as_function: diff --git a/gst/gstpad.c b/gst/gstpad.c index 560726f..d61418b 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -1890,6 +1890,9 @@ gst_pad_fixate_caps (GstPad * pad, GstCaps * caps) g_return_if_fail (GST_IS_PAD (pad)); g_return_if_fail (caps != NULL); + if (gst_caps_is_fixed (caps)) + return; + fixatefunc = GST_PAD_FIXATECAPSFUNC (pad); if (fixatefunc) { fixatefunc (pad, caps); -- 2.7.4