Commit 1330870c authored by Wim Taymans's avatar Wim Taymans

Assorted fixes.

Original commit message from CVS:
Assorted fixes.
Use the new clocking stuff.
parent 88ea69cb
...@@ -763,6 +763,7 @@ gst/chart/Makefile ...@@ -763,6 +763,7 @@ gst/chart/Makefile
gst/cutter/Makefile gst/cutter/Makefile
gst/deinterlace/Makefile gst/deinterlace/Makefile
gst/flx/Makefile gst/flx/Makefile
gst/goom/Makefile
gst/intfloat/Makefile gst/intfloat/Makefile
gst/law/Makefile gst/law/Makefile
gst/level/Makefile gst/level/Makefile
...@@ -835,6 +836,7 @@ ext/shout/Makefile ...@@ -835,6 +836,7 @@ ext/shout/Makefile
ext/sidplay/Makefile ext/sidplay/Makefile
ext/smoothwave/Makefile ext/smoothwave/Makefile
ext/vorbis/Makefile ext/vorbis/Makefile
ext/tarkin/Makefile
ext/xmms/Makefile ext/xmms/Makefile
gst-libs/Makefile gst-libs/Makefile
gst-libs/gst/Makefile gst-libs/gst/Makefile
......
...@@ -159,7 +159,7 @@ gst_v4lmjpegsink_init (GstV4lMjpegSink *v4lmjpegsink) ...@@ -159,7 +159,7 @@ gst_v4lmjpegsink_init (GstV4lMjpegSink *v4lmjpegsink)
gst_pad_set_chain_function (v4lmjpegsink->sinkpad, gst_v4lmjpegsink_chain); gst_pad_set_chain_function (v4lmjpegsink->sinkpad, gst_v4lmjpegsink_chain);
gst_pad_set_connect_function (v4lmjpegsink->sinkpad, gst_v4lmjpegsink_sinkconnect); 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)); gst_clock_register(v4lmjpegsink->clock, GST_OBJECT(v4lmjpegsink));
v4lmjpegsink->width = -1; v4lmjpegsink->width = -1;
...@@ -234,7 +234,8 @@ gst_v4lmjpegsink_chain (GstPad *pad, ...@@ -234,7 +234,8 @@ gst_v4lmjpegsink_chain (GstPad *pad,
gst_clock_set (v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP (buf)); gst_clock_set (v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP (buf));
} }
else { 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 */ /* check size */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment