diff --git a/ChangeLog b/ChangeLog
index 620635cff8..7264b2ab37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2004-07-09  Thomas Vander Stichele  <thomas (at) apestaart (dot) org>
+
+	* ext/alsa/gstalsa.c: (gst_alsa_change_state):
+	* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event),
+	(gst_alsa_sink_loop), (gst_alsa_sink_change_state):
+	* ext/alsa/gstalsasrc.c: (gst_alsa_src_change_state):
+	* ext/libvisual/visual.c: (gst_visual_change_state):
+	* ext/ogg/gstoggdemux.c: (gst_ogg_demux_change_state):
+	* ext/theora/theoradec.c: (theora_dec_change_state):
+	* ext/theora/theoraenc.c: (theora_enc_change_state):
+	* ext/vorbis/vorbisdec.c: (vorbis_dec_change_state):
+	* gst-libs/gst/navigation/navigation.c:
+	* gst/adder/gstadder.c: (gst_adder_change_state):
+	* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_chain),
+	(gst_audio_convert_get_buffer):
+	* gst/multipart/multipartdemux.c:
+	(gst_multipart_demux_change_state):
+	* gst/playback/gstdecodebin.c: (gst_decode_bin_change_state):
+	* gst/playback/gstplaybasebin.c: (gst_play_base_bin_change_state):
+	* gst/playback/gstplaybin.c: (gst_play_bin_change_state):
+	* gst/videoscale/gstvideoscale.c:
+	(gst_videoscale_handle_src_event):
+	* gst/volume/gstvolume.c: (volume_chain_int16):
+	  don't assert in state change, this should be done by the base
+	  GstElement class.
+	  various debugging fixes.
+
 2004-07-08  Thomas Vander Stichele  <thomas (at) apestaart (dot) org>
 
 	* configure.ac:
diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c
index 649636f664..1aa3b3bc2d 100644
--- a/gst/multipart/multipartdemux.c
+++ b/gst/multipart/multipartdemux.c
@@ -344,19 +344,13 @@ gst_multipart_demux_change_state (GstElement * element)
 
   switch (GST_STATE_TRANSITION (element)) {
     case GST_STATE_NULL_TO_READY:
-      break;
     case GST_STATE_READY_TO_PAUSED:
-      break;
     case GST_STATE_PAUSED_TO_PLAYING:
-      break;
     case GST_STATE_PLAYING_TO_PAUSED:
-      break;
     case GST_STATE_PAUSED_TO_READY:
-      break;
     case GST_STATE_READY_TO_NULL:
       break;
     default:
-      g_assert_not_reached ();
       break;
   }