diff options
| author | Julien Moutte <julien@moutte.net> | 2005-02-12 18:41:49 +0000 |
|---|---|---|
| committer | Julien Moutte <julien@moutte.net> | 2005-02-12 18:41:49 +0000 |
| commit | 4aa7bf75d6261c41dbdbbd2bae13f9098bf46183 (patch) | |
| tree | 4149509ac6fd7fc0394ff88e13a98f37edcb2556 /sys/ximage/ximagesink.h | |
| parent | 6e2b751efb9e009116aa58630eb3f5cc37c08d85 (diff) | |
sys/ximage/ximagesink.c: Protect interface methods from chain and negotiation and vice versa (Fixes #166142).
Original commit message from CVS:
2005-02-12 Julien MOUTTE <julien@moutte.net>
* sys/ximage/ximagesink.c: (gst_ximagesink_xwindow_new),
(gst_ximagesink_sink_link), (gst_ximagesink_change_state),
(gst_ximagesink_chain), (gst_ximagesink_set_xwindow_id),
(gst_ximagesink_expose), (gst_ximagesink_set_property),
(gst_ximagesink_finalize), (gst_ximagesink_init): Protect interface
methods from chain and negotiation and vice versa (Fixes #166142).
* sys/ximage/ximagesink.h: Add stream_lock.
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_sink_link),
(gst_xvimagesink_chain), (gst_xvimagesink_buffer_free),
(gst_xvimagesink_buffer_alloc), (gst_xvimagesink_set_xwindow_id),
(gst_xvimagesink_expose): Check for xcontext before trying to link.
Diffstat (limited to 'sys/ximage/ximagesink.h')
| -rw-r--r-- | sys/ximage/ximagesink.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/ximage/ximagesink.h b/sys/ximage/ximagesink.h index 36c832a9e..dcbc82ce1 100644 --- a/sys/ximage/ximagesink.h +++ b/sys/ximage/ximagesink.h @@ -119,6 +119,7 @@ struct _GstXImageSink { gdouble framerate; GMutex *x_lock; + GMutex *stream_lock; /* Unused */ gint pixel_width, pixel_height; |