From 95fa5e8b95b4f2708bd5053a0873d343d667f6dd Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 14 Jul 2008 07:50:01 +0000 Subject: ext/resindvd/gstmpegdemux.c: Remove whitespace line. Original commit message from CVS: * ext/resindvd/gstmpegdemux.c: Remove whitespace line. * ext/resindvd/resindvdbin.c: * ext/resindvd/resindvdbin.h: Make it so that audio/video pads aren't added to the bin until after data flow starts. * ext/resindvd/resin-play: Move video buffer queue outside resindvdbin * ext/resindvd/resindvdsrc.c: Check that the nav_clock_id didn't already get unscheduled. * gst/dvdspu/gstdvdspu.c: Remove assert that sometimes triggers erroneously. --- ext/resindvd/resindvdsrc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ext/resindvd/resindvdsrc.c') diff --git a/ext/resindvd/resindvdsrc.c b/ext/resindvd/resindvdsrc.c index 3f06855e..7f07f0bf 100644 --- a/ext/resindvd/resindvdsrc.c +++ b/ext/resindvd/resindvdsrc.c @@ -1556,8 +1556,10 @@ rsn_dvdsrc_nav_clock_cb (GstClock * clock, GstClockTime time, GstClockID id, g_mutex_lock (src->dvd_lock); /* Destroy the clock id that caused this callback */ - gst_clock_id_unref (src->nav_clock_id); - src->nav_clock_id = NULL; + if (src->nav_clock_id) { + gst_clock_id_unref (src->nav_clock_id); + src->nav_clock_id = NULL; + } while (src->pending_nav_blocks) { RsnDvdPendingNav *cur = (RsnDvdPendingNav *) src->pending_nav_blocks->data; -- cgit v1.2.1