summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/jpeg/gstsmokeenc.c2
-rw-r--r--tests/check/Makefile.am2
-rw-r--r--tests/check/gst-plugins-good.supp127
4 files changed, 137 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 718909ce..cd48db4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-12 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * ext/jpeg/gstsmokeenc.c: (gst_smokeenc_chain):
+ * tests/check/Makefile.am:
+ * tests/check/gst-plugins-good.supp:
+ Add a few libjpeg suppressions and initialize a variable to
+ make smokeenc valgrind clean. Fixes bug #515701.
+
2008-02-11 Jan Schmidt <jan.schmidt@sun.com>
* gst/avi/gstavidemux.c:
diff --git a/ext/jpeg/gstsmokeenc.c b/ext/jpeg/gstsmokeenc.c
index 87e4085a..6dc4abea 100644
--- a/ext/jpeg/gstsmokeenc.c
+++ b/ext/jpeg/gstsmokeenc.c
@@ -320,7 +320,7 @@ gst_smokeenc_chain (GstPad * pad, GstBuffer * buf)
smokeenc->need_header = FALSE;
}
- outsize = smokeenc->width * smokeenc->height * 3;
+ encsize = outsize = smokeenc->width * smokeenc->height * 3;
outbuf = gst_buffer_new_and_alloc (outsize);
outdata = GST_BUFFER_DATA (outbuf);
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 77e20a8d..c57826ce 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -97,7 +97,7 @@ VALGRIND_TESTS_DISABLE = \
elements/videocrop \
$(VALGRIND_TO_FIX)
-SUPPRESSIONS = $(top_srcdir)/common/gst.supp
+SUPPRESSIONS = $(top_srcdir)/common/gst.supp $(srcdir)/gst-plugins-good.supp
elements_audiopanorama_LDADD = \
$(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) \
diff --git a/tests/check/gst-plugins-good.supp b/tests/check/gst-plugins-good.supp
new file mode 100644
index 00000000..3e987e60
--- /dev/null
+++ b/tests/check/gst-plugins-good.supp
@@ -0,0 +1,127 @@
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jpeg_finish_decompress
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jpeg_consume_input
+ fun:jpeg_read_header
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ fun:jpeg_fill_bit_buffer
+ fun:jpeg_huff_decode
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jpeg_read_raw_data
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ fun:jpeg_fill_bit_buffer
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jpeg_read_raw_data
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jpeg_consume_input
+ fun:jpeg_read_header
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ obj:/usr/lib/libjpeg.so.*
+ fun:jpeg_finish_compress
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jpeg_finish_compress
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jpeg_finish_compress
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jpeg_write_raw_data
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jpeg_write_raw_data
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jpeg_write_raw_data
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jpeg_write_raw_data
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jinit_compress_master
+ fun:jpeg_start_compress
+}
+
+{
+ <several valgrind warnings as found with libjpeg 6b on Debian>
+ Memcheck:Cond
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ obj:/usr/lib/libjpeg.so.*
+ fun:jinit_compress_master
+ fun:jpeg_start_compress
+}