summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
m---------common0
-rw-r--r--ext/jpeg/gstsmokedec.c4
-rw-r--r--ext/jpeg/gstsmokeenc.c8
4 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ceecf6a..6f24cab7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-04 Wim Taymans <wim@fluendo.com>
+
+ * ext/jpeg/gstsmokedec.c: (gst_smokedec_chain):
+ * ext/jpeg/gstsmokeenc.c: (gst_smokeenc_chain):
+ Fix leaks.
+
2006-01-02 Alessandro Decina <alessandro at nnva dot org>
Reviewed by: Tim-Philipp Müller <tim at centricular dot net>
diff --git a/common b/common
-Subproject d1911d4b3d6267f9cd9dfb68fcef2afe4d09809
+Subproject 5f10c872cafb3eb8058d63e438cae029ed9e8d7
diff --git a/ext/jpeg/gstsmokedec.c b/ext/jpeg/gstsmokedec.c
index 184220d7..8aebefc7 100644
--- a/ext/jpeg/gstsmokedec.c
+++ b/ext/jpeg/gstsmokedec.c
@@ -220,7 +220,9 @@ gst_smokedec_chain (GstPad * pad, GstData * _data)
outbuf = gst_buffer_new ();
outsize = GST_BUFFER_SIZE (outbuf) = width * height + width * height / 2;
- outdata = GST_BUFFER_DATA (outbuf) = g_malloc (outsize);
+ outdata = g_malloc (outsize);
+ GST_BUFFER_DATA (outbuf) = outdata;
+ GST_BUFFER_MALLOCDATA (outbuf) = outdata;
GST_BUFFER_DURATION (outbuf) = GST_SECOND * fps_denom / fps_num;
GST_BUFFER_OFFSET (outbuf) = GST_BUFFER_OFFSET (buf);
diff --git a/ext/jpeg/gstsmokeenc.c b/ext/jpeg/gstsmokeenc.c
index 2923380e..90055943 100644
--- a/ext/jpeg/gstsmokeenc.c
+++ b/ext/jpeg/gstsmokeenc.c
@@ -308,7 +308,9 @@ gst_smokeenc_chain (GstPad * pad, GstBuffer * buf)
if (smokeenc->need_header) {
outbuf = gst_buffer_new ();
outsize = 256;
- outdata = GST_BUFFER_DATA (outbuf) = g_malloc (outsize);
+ outdata = g_malloc (outsize);
+ GST_BUFFER_DATA (outbuf) = outdata;
+ GST_BUFFER_MALLOCDATA (outbuf) = outdata;
GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf);
GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (buf);
@@ -323,7 +325,9 @@ gst_smokeenc_chain (GstPad * pad, GstBuffer * buf)
outbuf = gst_buffer_new ();
outsize = smokeenc->width * smokeenc->height * 3;
- outdata = GST_BUFFER_DATA (outbuf) = g_malloc (outsize);
+ outdata = g_malloc (outsize);
+ GST_BUFFER_DATA (outbuf) = outdata;
+ GST_BUFFER_MALLOCDATA (outbuf) = outdata;
GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf);
GST_BUFFER_DURATION (outbuf) =
smokeenc->fps_denom * GST_SECOND / smokeenc->fps_num;