mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 21:21:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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
This commit is contained in:
Benjamin Otte 2004-07-12 21:20:40 +00:00
parent fb7d3a201c
commit 2ab9d39848
3 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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> 2004-07-12 Steve Lhomme <steve.lhomme@free.fr>
* gst/elements/gstfilesink.c: * gst/elements/gstfilesink.c:
* gst/elements/gstfilesrc.c: * gst/elements/gstfilesrc.c:

4
configure.ac
View file

@ -436,8 +436,10 @@ esac],
dnl valgrind inclusion dnl valgrind inclusion
USE_VALGRIND="$USE_DEBUG" USE_VALGRIND="$USE_DEBUG"
VALGRIND_REQ="2.1"
if test "x$USE_VALGRIND" = xyes; then 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 fi
if test "x$USE_VALGRIND" = xyes; then if test "x$USE_VALGRIND" = xyes; then
AC_DEFINE(HAVE_VALGRIND, 1, [Define if valgrind should be used]) AC_DEFINE(HAVE_VALGRIND, 1, [Define if valgrind should be used])

14
gst/gstpad.c
View file

@ -2894,21 +2894,21 @@ gst_pad_alloc_buffer (GstPad * pad, guint64 offset, gint size)
peer = GST_RPAD_PEER (pad); peer = GST_RPAD_PEER (pad);
if (!peer) if (peer && peer->bufferallocfunc) {
return gst_buffer_new_and_alloc (size); GstBuffer *ret;
GST_CAT_DEBUG (GST_CAT_BUFFER, "(%s:%s): getting buffer", GST_CAT_DEBUG (GST_CAT_BUFFER, "(%s:%s): getting buffer",
GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_PAD_NAME (pad));
if (peer->bufferallocfunc) {
GST_CAT_DEBUG (GST_CAT_PADS, GST_CAT_DEBUG (GST_CAT_PADS,
"calling bufferallocfunc &%s (@%p) of peer pad %s:%s", "calling bufferallocfunc &%s (@%p) of peer pad %s:%s",
GST_DEBUG_FUNCPTR_NAME (peer->bufferallocfunc), GST_DEBUG_FUNCPTR_NAME (peer->bufferallocfunc),
&peer->bufferallocfunc, GST_DEBUG_PAD_NAME (((GstPad *) peer))); &peer->bufferallocfunc, GST_DEBUG_PAD_NAME (((GstPad *) peer)));
return (peer->bufferallocfunc) (GST_PAD (peer), offset, size);
} else { ret = (peer->bufferallocfunc) (GST_PAD (peer), offset, size);
return gst_buffer_new_and_alloc (size); if (ret)
return ret;
} }
return gst_buffer_new_and_alloc (size);
} }
static void static void