From 8e8e2bf4513b238ed4f0ba6d32e88db60f8e91dc Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 15 Oct 2008 09:39:27 +0000 Subject: [PATCH] gst/qtdemux/qtdemux.c: Remove previous wrong commit Original commit message from CVS: * gst/qtdemux/qtdemux.c: Remove previous wrong commit * tests/check/elements/icydemux.c: (icydemux_found_pad): Remove problematic and useless refcount check. Fixes #556381 --- ChangeLog | 7 +++++++ gst/qtdemux/qtdemux.c | 2 ++ tests/check/elements/icydemux.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3619447412..bb020d1f9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-15 Edward Hervey + + * gst/qtdemux/qtdemux.c: Remove previous wrong commit + * tests/check/elements/icydemux.c: (icydemux_found_pad): + Remove problematic and useless refcount check. + Fixes #556381 + 2008-10-15 Edward Hervey * gst/qtdemux/qtdemux.c: (qtdemux_parse_node): diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index cfb04482a7..f0b89d502f 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -2612,6 +2612,8 @@ qtdemux_parse_node (GstQTDemux * qtdemux, GNode * node, guint8 * buffer, } version = QT_UINT32 (buffer + 16); + GST_WARNING_OBJECT (qtdemux, "mp4a version 0x%08x", version); + /* parse any esds descriptors */ switch (version) { case 0x00000000: diff --git a/tests/check/elements/icydemux.c b/tests/check/elements/icydemux.c index 410ac538eb..9cfe3aae17 100644 --- a/tests/check/elements/icydemux.c +++ b/tests/check/elements/icydemux.c @@ -87,7 +87,7 @@ icydemux_found_pad (GstElement * src, GstPad * pad, gpointer data) fail_unless (gst_pad_link (srcpad, sinkpad) == GST_PAD_LINK_OK, "Failed to link pads"); gst_object_unref (srcpad); - ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 2); + gst_pad_set_active (sinkpad, TRUE); }