summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gst/qtdemux/qtdemux.c2
-rw-r--r--tests/check/elements/icydemux.c2
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 36194474..bb020d1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-10-15 Edward Hervey <edward.hervey@collabora.co.uk>
+ * 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 <edward.hervey@collabora.co.uk>
+
* gst/qtdemux/qtdemux.c: (qtdemux_parse_node):
Remove problematic and useless refcount check.
Fixes #556381
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index cfb04482..f0b89d50 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 410ac538..9cfe3aae 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);
}