summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2007-03-04 14:56:53 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2007-03-04 14:56:53 +0000
commit7f83d0233b8dfc1fd5030604cc1a2d918109b0ca (patch)
treed289b44ceef13d3173e5609669ffbb049f3beeef
parentde1357a4074d7cab9df163237bcfbce653d417e7 (diff)
sys/ximage/gstximagesrc.c: Catch the case where no clock has been set.
Original commit message from CVS: * sys/ximage/gstximagesrc.c: (gst_ximage_src_create): Catch the case where no clock has been set.
-rw-r--r--ChangeLog5
-rw-r--r--sys/ximage/gstximagesrc.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 19b11ab0..e656667c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-03-04 Jan Schmidt <thaytan@mad.scientist.com>
+ * sys/ximage/gstximagesrc.c: (gst_ximage_src_create):
+ Catch the case where no clock has been set.
+
+2007-03-04 Jan Schmidt <thaytan@mad.scientist.com>
+
* ext/flac/gstflacenc.c: (gst_flac_enc_finalize):
* ext/gconf/gstgconfaudiosink.c: (gst_gconf_audio_sink_class_init),
(gst_gconf_audio_sink_dispose), (gst_gconf_audio_sink_finalize):
diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c
index d695837f..024f7c63 100644
--- a/sys/ximage/gstximagesrc.c
+++ b/sys/ximage/gstximagesrc.c
@@ -658,6 +658,13 @@ gst_ximage_src_create (GstPushSrc * bs, GstBuffer ** buf)
* before capturing */
GST_OBJECT_LOCK (s);
+ if (GST_ELEMENT_CLOCK (s) == NULL) {
+ GST_OBJECT_UNLOCK (s);
+ GST_ELEMENT_ERROR (s, RESOURCE, FAILED,
+ (_("Cannot operate without a clock")), (NULL));
+ return GST_FLOW_ERROR;
+ }
+
base_time = GST_ELEMENT_CAST (s)->base_time;
next_capture_ts = gst_clock_get_time (GST_ELEMENT_CLOCK (s));
next_capture_ts -= base_time;