Add a few libjpeg suppressions and initialize a variable to make smokeenc valgrind...

Original commit message from CVS:
* 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.

diff --git a/ChangeLog b/ChangeLog
index 718909ce3260cb3806f10e01926eb9491f1befaf..cd48db4ecf2ad588d761b89689e2999abcbbd880 100644 (file)
--- 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 87e4085a68f8cf1d0ff5135e4835b1b91312023b..6dc4abea7807f8ced8e45894d26805373e78b3ec 100644 (file)
--- 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 77e20a8d2bdffb29617888cba452ece348db6021..c57826cecab69a9546b697d1b3471183a0920dff 100644 (file)
--- 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 (file)
index 0000000..3e987e6
--- /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
+}