summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--gst-libs/gst/audio/audio.h4
-rw-r--r--gst/playondemand/filter.func6
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5778d75e..0b36fb89 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 0b67ebc1..4a3428dd 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/playondemand/filter.func b/gst/playondemand/filter.func
index cded073e..092bbe56 100644
--- a/gst/playondemand/filter.func
+++ b/gst/playondemand/filter.func
@@ -11,14 +11,12 @@ do {
while (! filter->eos && in != NULL && GST_IS_EVENT (in)) {
GstEvent *event = GST_EVENT (in);
if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) {
- gst_event_unref (event);
- gst_data_free (in);
+ gst_data_unref (in);
in = NULL;
filter->eos = TRUE;
} else if ((GST_EVENT_TYPE (event) == GST_EVENT_DISCONTINUOUS) ||
(GST_EVENT_TYPE (event) == GST_EVENT_FLUSH)) {
- gst_event_unref (event);
- gst_data_free (in);
+ gst_data_unref (in);
in = NULL;
filter->eos = FALSE;
filter->write = 0;