From: Benjamin Otte <otte@gnome.org>
Date: Mon, 12 Jul 2004 21:20:40 +0000 (+0000)
Subject: configure.ac: require valgrind >= 2.1 (fixes Gentoo bug 53967, see http://bugs.gentoo... 
X-Git-Tag: RELEASE-0_8_4~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ab9d39848c805078e1268ce000a2b86d4692b82;p=platform%2Fupstream%2Fgstreamer.git

configure.ac: require valgrind >= 2.1 (fixes Gentoo bug 53967, see bugs.gentoo.org/show_bug.cgi?id=53967)

Original commit message from CVS:
* configure.ac:
require valgrind >= 2.1 (fixes Gentoo bug 53967, see
http://bugs.gentoo.org/show_bug.cgi?id=53967)
* gst/gstpad.c: (gst_pad_alloc_buffer):
allow buffer_alloc functions to return NULL and allocate a normal
buffer in that case
---

diff --git a/ChangeLog b/ChangeLog
index 3412ff7b54..5d0556824b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-07-12  Benjamin Otte  <otte@gnome.org>
+
+	* configure.ac:
+	  require valgrind >= 2.1 (fixes Gentoo bug 53967, see
+	  http://bugs.gentoo.org/show_bug.cgi?id=53967)
+	* gst/gstpad.c: (gst_pad_alloc_buffer):
+	  allow buffer_alloc functions to return NULL and allocate a normal
+	  buffer in that case
+
 2004-07-12  Steve Lhomme  <steve.lhomme@free.fr>
 	* gst/elements/gstfilesink.c:
 	* gst/elements/gstfilesrc.c:
@@ -15,12 +24,12 @@
 	  Update to another gettext public build
 
 2004-07-12  Steve Lhomme  <steve.lhomme@free.fr>
-    * gst/gstplugin.c:
-      Fix an impossible C syntax
-    * win32/config.h:
-      Disable i18n under Windows for the moment
-    * win32/gst-register.vcproj:
-      Use this configuration
+	* gst/gstplugin.c:
+	  Fix an impossible C syntax
+	* win32/config.h:
+	  Disable i18n under Windows for the moment
+	* win32/gst-register.vcproj:
+	  Use this configuration
 
 2004-07-12  Jan Schmidt  <thaytan@mad.scientis.com>
 	* docs/manual/quotes.xml:
diff --git a/configure.ac b/configure.ac
index 2fac3942a2..07acb1af59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -436,8 +436,10 @@ esac],
 
 dnl valgrind inclusion
 USE_VALGRIND="$USE_DEBUG"
+VALGRIND_REQ="2.1"
 if test "x$USE_VALGRIND" = xyes; then
-  PKG_CHECK_MODULES(VALGRIND, valgrind, USE_VALGRIND="yes", USE_VALGRIND="no")
+
+  PKG_CHECK_MODULES(VALGRIND, valgrind > $VALGRIND_REQ, USE_VALGRIND="yes", USE_VALGRIND="no")
 fi
 if test "x$USE_VALGRIND" = xyes; then
   AC_DEFINE(HAVE_VALGRIND, 1, [Define if valgrind should be used])
diff --git a/gst/gstpad.c b/gst/gstpad.c
index b03afafbe5..d8bddd32af 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -2894,21 +2894,21 @@ gst_pad_alloc_buffer (GstPad * pad, guint64 offset, gint size)
 
   peer = GST_RPAD_PEER (pad);
 
-  if (!peer)
-    return gst_buffer_new_and_alloc (size);
+  if (peer && peer->bufferallocfunc) {
+    GstBuffer *ret;
 
-  GST_CAT_DEBUG (GST_CAT_BUFFER, "(%s:%s): getting buffer",
-      GST_DEBUG_PAD_NAME (pad));
-
-  if (peer->bufferallocfunc) {
+    GST_CAT_DEBUG (GST_CAT_BUFFER, "(%s:%s): getting buffer",
+        GST_DEBUG_PAD_NAME (pad));
     GST_CAT_DEBUG (GST_CAT_PADS,
         "calling bufferallocfunc &%s (@%p) of peer pad %s:%s",
         GST_DEBUG_FUNCPTR_NAME (peer->bufferallocfunc),
         &peer->bufferallocfunc, GST_DEBUG_PAD_NAME (((GstPad *) peer)));
-    return (peer->bufferallocfunc) (GST_PAD (peer), offset, size);
-  } else {
-    return gst_buffer_new_and_alloc (size);
+
+    ret = (peer->bufferallocfunc) (GST_PAD (peer), offset, size);
+    if (ret)
+      return ret;
   }
+  return gst_buffer_new_and_alloc (size);
 }
 
 static void