diff --git a/ChangeLog b/ChangeLog
index c2acb172d7..e4da7bfdb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-15  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_change_state):
+	  Make state change function thread safe.
+
 2005-11-15  Edward Hervey  <edward@fluendo.com>
 
 	* ext/ogg/gstoggdemux.c: (gst_ogg_demux_receive_event),
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index f7274e67a8..8d8ab89d9d 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -1444,6 +1444,7 @@ gst_xvimagesink_setcaps (GstBaseSink * bsink, GstCaps * caps)
 static GstStateChangeReturn
 gst_xvimagesink_change_state (GstElement * element, GstStateChange transition)
 {
+  GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
   GstXvImageSink *xvimagesink;
 
   xvimagesink = GST_XVIMAGESINK (element);
@@ -1472,6 +1473,15 @@ gst_xvimagesink_change_state (GstElement * element, GstStateChange transition)
       break;
     case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       break;
+    default:
+      break;
+  }
+
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+  if (ret == GST_STATE_CHANGE_FAILURE)
+    return ret;
+
+  switch (transition) {
     case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       break;
     case GST_STATE_CHANGE_PAUSED_TO_READY:
@@ -1498,9 +1508,11 @@ gst_xvimagesink_change_state (GstElement * element, GstStateChange transition)
         xvimagesink->xcontext = NULL;
       }
       break;
+    default:
+      break;
   }
 
-  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+  return ret;
 }
 
 static void