From: Benjamin O. <co...@pd...> - 2004-02-27 21:50:56
|
CVS Root: /home/cvs/gstreamer Module: gst-plugins Changes by: company Date: Fri Feb 27 2004 13:48:01 PST Log message: 2004-02-27 Benjamin Otte <ot...@gn...> * 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. Modified files: . : ChangeLog gst-libs/gst/audio: audio.h gst/asfdemux : gstasfdemux.c gst/playondemand: filter.func Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.346&r2=1.347 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst-libs/gst/audio/audio.h.diff?r1=1.11&r2=1.12 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/asfdemux/gstasfdemux.c.diff?r1=1.47&r2=1.48 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/playondemand/filter.func.diff?r1=1.13&r2=1.14 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /home/cvs/gstreamer/gst-plugins/ChangeLog,v retrieving revision 1.346 retrieving revision 1.347 diff -u -d -r1.346 -r1.347 --- a/ChangeLog 27 Feb 2004 02:39:18 -0000 1.346 +++ b/ChangeLog 27 Feb 2004 21:47:49 -0000 1.347 @@ -1,3 +1,12 @@ +2004-02-27 Benjamin Otte <ot...@gn...> + + * 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...@sc...> * gst-libs/gst/colorbalance/Makefile.am: Index: audio.h RCS file: /home/cvs/gstreamer/gst-plugins/gst-libs/gst/audio/audio.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- a/audio.h 26 Jan 2004 03:54:21 -0000 1.11 +++ b/audio.h 27 Feb 2004 21:47:49 -0000 1.12 @@ -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 @@ G_END_DECLS +#endif /* __GST_AUDIO_AUDIO_H__ */ Index: gstasfdemux.c RCS file: /home/cvs/gstreamer/gst-plugins/gst/asfdemux/gstasfdemux.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- a/gstasfdemux.c 23 Feb 2004 22:16:21 -0000 1.47 +++ b/gstasfdemux.c 27 Feb 2004 21:47:49 -0000 1.48 @@ -1052,7 +1052,7 @@ 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; Index: filter.func RCS file: /home/cvs/gstreamer/gst-plugins/gst/playondemand/filter.func,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- a/filter.func 22 Dec 2003 01:47:05 -0000 1.13 +++ b/filter.func 27 Feb 2004 21:47:49 -0000 1.14 @@ -11,14 +11,12 @@ 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)) { filter->eos = FALSE; filter->write = 0; |