diff --git a/ChangeLog b/ChangeLog
index 2c34469b67..eae68b58f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-01-27  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
+	* gst/asfdemux/asfheaders.h:
+	* gst/asfdemux/gstasfdemux.c: 
+	* gst/asfdemux/gstasfmux.c: (gst_asfmux_put_guid),
+	(gst_asfmux_put_string), (gst_asfmux_put_wav_header),
+	(gst_asfmux_put_vid_header), (gst_asfmux_put_bmp_header):
+	  lot's of fixes to make data extraction simpler and get the code
+	  architecture and compiler independant. Add debugging category
+	* gst/goom/gstgoom.c: (gst_goom_change_state):
+	  reset channel count on PAUSED=>READY, not READY=>PAUSED
+
 2004-01-26  Colin Walters  <walters@verbum.org>
 
 	* ext/gnomevfs/gstgnomevfssrc.c (gst_gnomevfssrc_get): Remove ugly
diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index db40a13dad..6fe574bb94 100644
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -359,9 +359,9 @@ gst_goom_change_state (GstElement *element)
     case GST_STATE_READY_TO_PAUSED:
       goom->next_time = 0;
       goom->srcnegotiated = FALSE;
-      goom->channels = 0;
       break;
     case GST_STATE_PAUSED_TO_READY:
+      goom->channels = 0;
       break;
     default:
       break;