From 1330870c10f6c731afbf9cd05cfc7b3e9be9c6c9 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sun, 3 Feb 2002 20:10:04 +0000 Subject: [PATCH] Assorted fixes. Original commit message from CVS: Assorted fixes. Use the new clocking stuff. --- configure.ac | 2 ++ sys/v4l/gstv4lmjpegsink.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 91be69f..1c183b1 100644 --- a/configure.ac +++ b/configure.ac @@ -763,6 +763,7 @@ gst/chart/Makefile gst/cutter/Makefile gst/deinterlace/Makefile gst/flx/Makefile +gst/goom/Makefile gst/intfloat/Makefile gst/law/Makefile gst/level/Makefile @@ -835,6 +836,7 @@ ext/shout/Makefile ext/sidplay/Makefile ext/smoothwave/Makefile ext/vorbis/Makefile +ext/tarkin/Makefile ext/xmms/Makefile gst-libs/Makefile gst-libs/gst/Makefile diff --git a/sys/v4l/gstv4lmjpegsink.c b/sys/v4l/gstv4lmjpegsink.c index 8f38314..7fbc599 100644 --- a/sys/v4l/gstv4lmjpegsink.c +++ b/sys/v4l/gstv4lmjpegsink.c @@ -159,7 +159,7 @@ gst_v4lmjpegsink_init (GstV4lMjpegSink *v4lmjpegsink) gst_pad_set_chain_function (v4lmjpegsink->sinkpad, gst_v4lmjpegsink_chain); gst_pad_set_connect_function (v4lmjpegsink->sinkpad, gst_v4lmjpegsink_sinkconnect); - v4lmjpegsink->clock = gst_clock_get_system(); + v4lmjpegsink->clock = gst_system_clock_obtain (); gst_clock_register(v4lmjpegsink->clock, GST_OBJECT(v4lmjpegsink)); v4lmjpegsink->width = -1; @@ -234,7 +234,8 @@ gst_v4lmjpegsink_chain (GstPad *pad, gst_clock_set (v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP (buf)); } else { - gst_clock_wait(v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP(buf), GST_OBJECT(v4lmjpegsink)); + //gst_clock_wait(v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP(buf), GST_OBJECT(v4lmjpegsink)); + gst_clock_wait(v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP(buf)); } /* check size */ -- 2.7.4