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

gstbin.c: commented out the requirement that a bin be !PLAYING to add gstthread.c: fixed an old failed merge that loc...

Browse source 
Original commit message from CVS:
gstbin.c: commented out the requirement that a bin be !PLAYING to add
gstthread.c: fixed an old failed merge that locked the same mutex twice
...in a row
This commit is contained in:
Erik Walthinsen 2001-04-26 22:32:13 +00:00
parent 583f6660fa
commit 0e6ec7d33d
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/gstbin.c
View file

@ -265,7 +265,7 @@ gst_bin_add (GstBin *bin,
GST_DEBUG_ENTER (""); GST_DEBUG_ENTER ("");
// must be not be in PLAYING state in order to modify bin // must be not be in PLAYING state in order to modify bin
g_return_if_fail (GST_STATE (bin) != GST_STATE_PLAYING); // g_return_if_fail (GST_STATE (bin) != GST_STATE_PLAYING);
// the element must not already have a parent // the element must not already have a parent
g_return_if_fail (GST_ELEMENT_PARENT(element) == NULL); g_return_if_fail (GST_ELEMENT_PARENT(element) == NULL);

2
gst/gstthread.c
View file

@ -252,8 +252,6 @@ gst_thread_change_state (GstElement *element)
GST_DEBUG (GST_CAT_THREAD, "creating thread \"%s\"\n", GST_DEBUG (GST_CAT_THREAD, "creating thread \"%s\"\n",
GST_ELEMENT_NAME (GST_ELEMENT (element))); GST_ELEMENT_NAME (GST_ELEMENT (element)));
g_mutex_lock(thread->lock);
g_mutex_lock (thread->lock); g_mutex_lock (thread->lock);
// create the thread // create the thread
pthread_create (&thread->thread_id, NULL, pthread_create (&thread->thread_id, NULL,