diff --git a/ChangeLog b/ChangeLog
index 5778d75e31..0b36fb898c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-27  Benjamin Otte  <otte@gnome.org>
+
+	* gst-libs/gst/audio/audio.h:
+	  add macro to make sure header isn't included twice
+	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_chunk):
+	  don't use gst_buffer_free
+	* gst/playondemand/filter.func:
+	  don't usae gst_data_free. Free data only once.
+
 2004-02-26  David Schleef  <ds@schleef.org>
 
 	* gst-libs/gst/colorbalance/Makefile.am:
diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h
index 0b67ebc102..4a3428ddb3 100644
--- a/gst-libs/gst/audio/audio.h
+++ b/gst-libs/gst/audio/audio.h
@@ -22,6 +22,9 @@
 
 #include <gst/audio/audioclock.h>
 
+#ifndef __GST_AUDIO_AUDIO_H__
+#define __GST_AUDIO_AUDIO_H__
+
 G_BEGIN_DECLS
 
 /* For people that are looking at this source: the purpose of these defines is
@@ -124,3 +127,4 @@ void gst_audio_structure_set_int (GstStructure *structure, GstAudioFieldFlag fla
 
 G_END_DECLS
 
+#endif /* __GST_AUDIO_AUDIO_H__ */
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 7006a5feff..1a5d614e10 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -1052,7 +1052,7 @@ gst_asf_demux_process_chunk (GstASFDemux *asf_demux,
       if (segment_info->frag_offset != 0) {
 	/* cannot create new packet */
 	GST_DEBUG ("BUFFER: Freeing stream->payload (%p)", stream->payload);
-	gst_buffer_free(stream->payload);
+	gst_buffer_unref (stream->payload);
 	gst_bytestream_flush (bs, segment_info->chunk_size);
 	packet_info->size_left -= segment_info->chunk_size;
 	return TRUE;