mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gstparse.c: Do not hange on recursive uasge of gst_parse_launch()

Browse source 
Original commit message from CVS:
* gst/gstparse.c: (gst_parse_launch):
Do not hange on recursive uasge of gst_parse_launch()
This commit is contained in:
Stefan Kost 2006-07-20 20:02:55 +00:00
parent 95563518f4
commit 04ed9e8f34
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-07-20 Stefan Kost <ensonic@users.sf.net>
* gst/gstparse.c: (gst_parse_launch):
Do not hange on recursive uasge of gst_parse_launch()
2006-07-20 Tim-Philipp Müller <tim at centricular dot net>
* gst/gsttaglist.c:

11
gst/gstparse.c
View file

@ -136,7 +136,7 @@ gst_parse_launchv (const gchar ** argv, GError ** error)
GstElement *
gst_parse_launch (const gchar * pipeline_description, GError ** error)
{
GstElement *element;
GstElement *element = NULL;
static GStaticMutex flex_lock = G_STATIC_MUTEX_INIT;
g_return_val_if_fail (pipeline_description != NULL, NULL);
@ -145,9 +145,12 @@ gst_parse_launch (const gchar * pipeline_description, GError ** error)
pipeline_description);
/* the need for the mutex will go away with flex 2.5.6 */
g_static_mutex_lock (&flex_lock);
element = _gst_parse_launch (pipeline_description, error);
g_static_mutex_unlock (&flex_lock);
if (g_static_mutex_trylock (&flex_lock)) {
element = _gst_parse_launch (pipeline_description, error);
g_static_mutex_unlock (&flex_lock);
} else {
GST_WARNING ("gst_parse_launch() cannot be nested");
}
return element;
}