diff --git a/ChangeLog b/ChangeLog
index c4ed8ff210..a4a9020313 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-16  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* ext/swfdec/gstswfdec.c: (gst_swfdec_change_state):
+	  Don't return state change success when the parent
+	  failed.
+
 2005-01-16  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst/avi/gstavimux.c: (gst_avimux_handle_event):
diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c
index 4667ef1fad..91e79fb2bf 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -561,9 +561,7 @@ gst_swfdec_change_state (GstElement * element)
       break;
   }
 
-  GST_ELEMENT_CLASS (parent_class)->change_state (element);
-
-  return GST_STATE_SUCCESS;
+  return GST_ELEMENT_CLASS (parent_class)->change_state (element);
 }
 
 static void