diff --git a/ChangeLog b/ChangeLog
index f031e6b953..6d331a6c23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2004-01-15  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
+	* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event):
+	  Don't update the time of the clock
+	(gst_alsa_sink_loop):
+	  sync to the clock given to alsasink, not the own clock
+	* sys/oss/gstosssink.c: (gst_osssink_chain):
+	  sync to the clock
+	(gst_osssink_change_state):
+	  activate the clock
+	* sys/ximage/ximagesink.c: (gst_ximagesink_chain):
+	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_chain):
+	  remove bogus code that made DISCONT events unhandled
+	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_video_caps):
+	  explicitly case to double in _set_simple. (fixes 2nd warning in bug
+	  #131502)
+	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_read_object_header),
+	(gst_asf_demux_handle_sink_event), (gst_asf_demux_audio_caps),
+	(gst_asf_demux_add_audio_stream), (gst_asf_demux_video_caps):
+	  convert g_warning because of wrong asf data to GST_WARNINGs (fixes
+	  2nd warning in bug #131502)
+
 2004-01-14  Julien MOUTTE  <julien@moutte.net>
 
 	* gst/videofilter/gstvideobalance.c: (gst_videobalance_init),