mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-24 02:31:03 +00:00
sys/: Fix a locking-order bug I introduced with my changes the other day.
Original commit message from CVS: * sys/ximage/ximagesink.c: (gst_ximagesink_handle_xevents): * sys/xvimage/xvimagesink.c: (gst_xvimagesink_handle_xevents): Fix a locking-order bug I introduced with my changes the other day. Patch by Mike Smith.
This commit is contained in:
parent
b48b9fdc19
commit
cfc4403058
3 changed files with 9 additions and 2 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2007-05-21 Jan Schmidt <thaytan@mad.scientist.com>
|
||||||
|
|
||||||
|
* sys/ximage/ximagesink.c: (gst_ximagesink_handle_xevents):
|
||||||
|
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_handle_xevents):
|
||||||
|
Fix a locking-order bug I introduced with my changes the other day.
|
||||||
|
Patch by Mike Smith.
|
||||||
|
|
||||||
2007-05-21 Michael Smith <msmith@fluendo.com>
|
2007-05-21 Michael Smith <msmith@fluendo.com>
|
||||||
|
|
||||||
* ext/theora/theoradec.c: (theora_handle_data_packet):
|
* ext/theora/theoradec.c: (theora_handle_data_packet):
|
||||||
|
|
|
@ -1041,8 +1041,8 @@ gst_ximagesink_handle_xevents (GstXImageSink * ximagesink)
|
||||||
|
|
||||||
gst_ximagesink_expose (GST_X_OVERLAY (ximagesink));
|
gst_ximagesink_expose (GST_X_OVERLAY (ximagesink));
|
||||||
|
|
||||||
g_mutex_lock (ximagesink->x_lock);
|
|
||||||
g_mutex_lock (ximagesink->flow_lock);
|
g_mutex_lock (ximagesink->flow_lock);
|
||||||
|
g_mutex_lock (ximagesink->x_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Handle Display events */
|
/* Handle Display events */
|
||||||
|
|
|
@ -1177,8 +1177,8 @@ gst_xvimagesink_handle_xevents (GstXvImageSink * xvimagesink)
|
||||||
|
|
||||||
gst_xvimagesink_expose (GST_X_OVERLAY (xvimagesink));
|
gst_xvimagesink_expose (GST_X_OVERLAY (xvimagesink));
|
||||||
|
|
||||||
g_mutex_lock (xvimagesink->x_lock);
|
|
||||||
g_mutex_lock (xvimagesink->flow_lock);
|
g_mutex_lock (xvimagesink->flow_lock);
|
||||||
|
g_mutex_lock (xvimagesink->x_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Handle Display events */
|
/* Handle Display events */
|
||||||
|
|
Loading…
Reference in a new issue