mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-28 16:04:54 +00:00
gst/gstinfo.c: Add some newlines.
Original commit message from CVS: * gst/gstinfo.c: (__gst_in_valgrind): Add some newlines. * plugins/elements/gsttypefindelement.c: (gst_type_find_element_chain): Don't leak buffer caps.
This commit is contained in:
parent
5fc678a6a7
commit
a0d6437c15
3 changed files with 26 additions and 21 deletions
|
@ -1,3 +1,12 @@
|
|||
2006-04-06 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* gst/gstinfo.c: (__gst_in_valgrind):
|
||||
Add some newlines.
|
||||
|
||||
* plugins/elements/gsttypefindelement.c:
|
||||
(gst_type_find_element_chain):
|
||||
Don't leak buffer caps.
|
||||
|
||||
2006-04-06 Michael Smith <msmith@fluendo.com>
|
||||
|
||||
* gst/parse/grammar.y:
|
||||
|
|
|
@ -244,9 +244,9 @@ __gst_in_valgrind (void)
|
|||
#ifdef HAVE_VALGRIND
|
||||
if (RUNNING_ON_VALGRIND) {
|
||||
GST_CAT_INFO (GST_CAT_GST_INIT, "we're running inside valgrind");
|
||||
printf ("GStreamer has detected that it is running inside valgrind.");
|
||||
printf ("It might now take different code paths to ease debugging.");
|
||||
printf ("Of course, this may also lead to different bugs.");
|
||||
printf ("GStreamer has detected that it is running inside valgrind.\n");
|
||||
printf ("It might now take different code paths to ease debugging.\n");
|
||||
printf ("Of course, this may also lead to different bugs.\n");
|
||||
in_valgrind = GST_VG_INSIDE;
|
||||
} else {
|
||||
GST_CAT_LOG (GST_CAT_GST_INIT, "not doing extra valgrind stuff");
|
||||
|
|
|
@ -536,12 +536,9 @@ gst_type_find_element_chain (GstPad * pad, GstBuffer * buffer)
|
|||
|
||||
/* Shortcircuit typefinding if we already have non-any caps */
|
||||
if (typefind->mode == MODE_TYPEFIND) {
|
||||
GstCaps *caps = gst_buffer_get_caps (buffer);
|
||||
const GstCaps *caps = GST_BUFFER_CAPS (buffer);
|
||||
|
||||
if (caps) {
|
||||
if (gst_caps_is_any (caps)) {
|
||||
gst_caps_unref (caps);
|
||||
} else {
|
||||
if (caps && !gst_caps_is_any (caps)) {
|
||||
GST_DEBUG_OBJECT (typefind, "Skipping typefinding, using caps from "
|
||||
"upstream buffer: %" GST_PTR_FORMAT, caps);
|
||||
typefind->mode = MODE_NORMAL;
|
||||
|
@ -558,7 +555,6 @@ gst_type_find_element_chain (GstPad * pad, GstBuffer * buffer)
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
switch (typefind->mode) {
|
||||
case MODE_ERROR:
|
||||
|
|
Loading…
Reference in a new issue