From c9b86e0a983c41f27fec5c27df9dc1a02ad63dc8 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 21 Jul 2006 10:57:00 +0000 Subject: [PATCH] gst/avi/gstavidemux.c: Fix some leaks. Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_parse_stream), (gst_avi_demux_process_next_entry): Fix some leaks. * gst/id3demux/id3tags.c: (id3demux_id3v2_frames_to_tag_list): Don't use \n in debug lines. --- ChangeLog | 9 +++++++++ gst/avi/gstavidemux.c | 4 ++++ gst/id3demux/id3tags.c | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5a9a905743..be469856b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-07-21 Wim Taymans + + * gst/avi/gstavidemux.c: (gst_avi_demux_parse_stream), + (gst_avi_demux_process_next_entry): + Fix some leaks. + + * gst/id3demux/id3tags.c: (id3demux_id3v2_frames_to_tag_list): + Don't use \n in debug lines. + 2006-07-20 Stefan Kost * docs/plugins/gst-plugins-good-plugins-docs.sgml: diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 37800daf91..e790d6752e 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -1210,6 +1210,7 @@ gst_avi_demux_parse_stream (GstElement * element, GstBuffer * buf) gst_element_add_pad (GST_ELEMENT (avi), pad); GST_LOG_OBJECT (element, "Added pad %s with caps %" GST_PTR_FORMAT, GST_PAD_NAME (pad), caps); + gst_caps_unref (caps); if (codec_name) { if (!stream->taglist) @@ -1219,6 +1220,7 @@ gst_avi_demux_parse_stream (GstElement * element, GstBuffer * buf) gst_tag_list_add (stream->taglist, GST_TAG_MERGE_APPEND, tag_name, codec_name, NULL); + g_free (codec_name); } return TRUE; @@ -1231,6 +1233,7 @@ fail: gst_buffer_unref (buf); if (sub) gst_buffer_unref (sub); + g_free (codec_name); g_free (stream->strh); g_free (stream->strf.data); g_free (stream->name); @@ -2552,6 +2555,7 @@ gst_avi_demux_process_next_entry (GstAviDemux * avi) GST_WARNING_OBJECT (avi, "Short read at offset %" G_GUINT64_FORMAT ", only got %d/%d bytes (truncated file?)", entry->offset + avi->index_offset, GST_BUFFER_SIZE (buf), entry->size); + gst_buffer_unref (buf); res = stream->last_flow = GST_FLOW_UNEXPECTED; goto beach; } diff --git a/gst/id3demux/id3tags.c b/gst/id3demux/id3tags.c index 35571eca6c..22ea147d8c 100644 --- a/gst/id3demux/id3tags.c +++ b/gst/id3demux/id3tags.c @@ -423,7 +423,7 @@ id3demux_id3v2_frames_to_tag_list (ID3TagsWorking * work, guint size) #if 1 GST_LOG - ("Frame @ %d (0x%02x) id %s size %d, next=%d (0x%02x) obsolete=%d\n", + ("Frame @ %d (0x%02x) id %s size %d, next=%d (0x%02x) obsolete=%d", work->hdr.frame_data - start, work->hdr.frame_data - start, frame_id, frame_size, work->hdr.frame_data + frame_hdr_size + frame_size - start, work->hdr.frame_data + frame_hdr_size + frame_size - start,