diff options
| author | Mike Smith <msmith@xiph.org> | 2007-05-21 15:32:42 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2007-05-21 15:32:42 +0000 |
| commit | cfc440305880c2676395ed153cdd8c0c112a37dc (patch) | |
| tree | 1fd3b4534ed117c32cf77d815db56667f2f82c70 | |
| parent | b48b9fdc198b30bdad2197b19a22e120a9beccdd (diff) | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sys/ximage/ximagesink.c | 2 | ||||
| -rw-r--r-- | sys/xvimage/xvimagesink.c | 2 |
3 files changed, 9 insertions, 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> * ext/theora/theoradec.c: (theora_handle_data_packet): diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index 7f2a1d37..6acc1678 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -1041,8 +1041,8 @@ gst_ximagesink_handle_xevents (GstXImageSink * ximagesink) gst_ximagesink_expose (GST_X_OVERLAY (ximagesink)); - g_mutex_lock (ximagesink->x_lock); g_mutex_lock (ximagesink->flow_lock); + g_mutex_lock (ximagesink->x_lock); } /* Handle Display events */ diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index 2f19443a..a2635ff7 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -1177,8 +1177,8 @@ gst_xvimagesink_handle_xevents (GstXvImageSink * xvimagesink) gst_xvimagesink_expose (GST_X_OVERLAY (xvimagesink)); - g_mutex_lock (xvimagesink->x_lock); g_mutex_lock (xvimagesink->flow_lock); + g_mutex_lock (xvimagesink->x_lock); } /* Handle Display events */ |