diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2008-10-15 09:39:27 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2008-10-15 09:39:27 +0000 |
| commit | 8e8e2bf4513b238ed4f0ba6d32e88db60f8e91dc (patch) | |
| tree | f52b918832daf6514e38fee04031f4621ccf0b71 | |
| parent | 0af48261b4eb656bb1691c3d1b71f2e2dc93e485 (diff) | |
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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 2 | ||||
| -rw-r--r-- | tests/check/elements/icydemux.c | 2 |
3 files changed, 10 insertions, 1 deletions
@@ -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); } |