Original commit message from CVS:
2006-01-22 Julien MOUTTE <julien@moutte.net>
* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_destroy):
* sys/xvimage/xvimagesink.c: (gst_xvimage_buffer_destroy),
(gst_xvimagesink_buffer_alloc): Playbin keeps some ref to some
frames. We might get a frame destroyed after changing state to
NULL, adding a safety check on xcontext.
+2006-01-22 Julien MOUTTE <julien@moutte.net>
+
+ * sys/ximage/ximagesink.c: (gst_ximagesink_ximage_destroy):
+ * sys/xvimage/xvimagesink.c: (gst_xvimage_buffer_destroy),
+ (gst_xvimagesink_buffer_alloc): Playbin keeps some ref to some
+ frames. We might get a frame destroyed after changing state to
+ NULL, adding a safety check on xcontext.
+
2006-01-22 Tim-Philipp Müller <tim at centricular dot net>
* gst-libs/gst/interfaces/xoverlay.c:
ximagesink->cur_image = NULL;
}
+ /* We might have some buffers destroyed after changing state to NULL */
+ if (!ximagesink->xcontext) {
+ goto beach;
+ }
+
g_mutex_lock (ximagesink->x_lock);
#ifdef HAVE_XSHM
g_mutex_unlock (ximagesink->x_lock);
+beach:
if (ximage->ximagesink) {
/* Release the ref to our sink */
ximage->ximagesink = NULL;
if (xvimagesink->cur_image == xvimage)
xvimagesink->cur_image = NULL;
+ /* We might have some buffers destroyed after changing state to NULL */
+ if (xvimagesink->xcontext) {
+ goto beach;
+ }
+
g_mutex_lock (xvimagesink->x_lock);
#ifdef HAVE_XSHM
g_mutex_unlock (xvimagesink->x_lock);
+beach:
xvimage->xvimagesink = NULL;
gst_object_unref (xvimagesink);