From 115581eb2eaca70b892241a13d7d0f381b704caf Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Thu, 25 Oct 2012 00:43:51 -0300 Subject: [PATCH] imagefreeze: avoid assertion when using accept caps query This query must receive a fixed caps, so imagefreeze should fixate its framerate before sending the query downstream. https://bugzilla.gnome.org/show_bug.cgi?id=686837 --- gst/imagefreeze/gstimagefreeze.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gst/imagefreeze/gstimagefreeze.c b/gst/imagefreeze/gstimagefreeze.c index a7134c94d2..43150475a6 100644 --- a/gst/imagefreeze/gstimagefreeze.c +++ b/gst/imagefreeze/gstimagefreeze.c @@ -216,9 +216,9 @@ gst_image_freeze_sink_setcaps (GstImageFreeze * self, GstCaps * caps) GstStructure *s = gst_structure_copy (gst_caps_get_structure (caps, i)); gst_caps_append_structure (candidate, s); - if (gst_pad_peer_query_accept_caps (self->srcpad, candidate)) { - if (gst_structure_has_field_typed (s, "framerate", GST_TYPE_FRACTION) || - gst_structure_fixate_field_nearest_fraction (s, "framerate", 25, 1)) { + if (gst_structure_has_field_typed (s, "framerate", GST_TYPE_FRACTION) || + gst_structure_fixate_field_nearest_fraction (s, "framerate", 25, 1)) { + if (gst_pad_peer_query_accept_caps (self->srcpad, candidate)) { gst_structure_get_fraction (s, "framerate", &fps_n, &fps_d); if (fps_d != 0) { g_mutex_lock (&self->lock);