From e2b2ce11f16e3f20690def083b172f5a474ba349 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 14 Mar 2006 16:32:58 +0000 Subject: [PATCH] gst/gstpipeline.c: Add 'Since: 0.10.5' to gtk-doc blurb for added property. Original commit message from CVS: * gst/gstpipeline.c: (gst_pipeline_class_init): Add 'Since: 0.10.5' to gtk-doc blurb for added property. * plugins/elements/gsttypefindelement.c: (gst_type_find_element_handle_event): Don't try to typefind empty streams. --- ChangeLog | 9 +++++++++ gst/gstpipeline.c | 2 ++ plugins/elements/gsttypefindelement.c | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d6bd78..a254f54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-03-14 Tim-Philipp Müller + + * gst/gstpipeline.c: (gst_pipeline_class_init): + Add 'Since: 0.10.5' to gtk-doc blurb for added property. + + * plugins/elements/gsttypefindelement.c: + (gst_type_find_element_handle_event): + Don't try to typefind empty streams. + 2006-03-14 Wim Taymans * libs/gst/base/gstbasesink.c: (gst_base_sink_do_sync), diff --git a/gst/gstpipeline.c b/gst/gstpipeline.c index 759854a..c733c34 100644 --- a/gst/gstpipeline.c +++ b/gst/gstpipeline.c @@ -201,6 +201,8 @@ gst_pipeline_class_init (gpointer g_class, gpointer class_data) * The expected delay needed for elements to spin up to the * PLAYING state expressed in nanoseconds. * see gst_pipeline_set_delay() for more information on this option. + * + * Since: 0.10.5 **/ g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_DELAY, g_param_spec_uint64 ("delay", "Delay", diff --git a/plugins/elements/gsttypefindelement.c b/plugins/elements/gsttypefindelement.c index 2c1f0b6..efeec40 100644 --- a/plugins/elements/gsttypefindelement.c +++ b/plugins/elements/gsttypefindelement.c @@ -470,8 +470,10 @@ gst_type_find_element_handle_event (GstPad * pad, GstEvent * event) /* we might not have started typefinding yet because there was not * enough data so far; just give it a shot now and see what we get */ - caps = gst_type_find_helper_for_buffer (GST_OBJECT (typefind), - typefind->store, &prob); + if (typefind->store) { + caps = gst_type_find_helper_for_buffer (GST_OBJECT (typefind), + typefind->store, &prob); + } if (caps && prob >= typefind->min_probability) { g_signal_emit (typefind, gst_type_find_element_signals[HAVE_TYPE], -- 2.7.4