summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 58a5b2f)
raw | patch | inline | side by side (parent: 58a5b2f)
author | Andy Wingo <wingo@pobox.com> | |
Tue, 15 Nov 2005 12:35:45 +0000 (12:35 +0000) | ||
committer | Andy Wingo <wingo@pobox.com> | |
Tue, 15 Nov 2005 12:35:45 +0000 (12:35 +0000) |
Original commit message from CVS:
2005-11-15 Andy Wingo <wingo@pobox.com>
* gst/elements/gstfakesrc.c (gst_fake_src_create): It's not an
error if the user selected "no clock" as the clocking method.
2005-11-15 Andy Wingo <wingo@pobox.com>
* gst/elements/gstfakesrc.c (gst_fake_src_create): It's not an
error if the user selected "no clock" as the clocking method.
ChangeLog | patch | blob | history | |
gst/elements/gstfakesrc.c | patch | blob | history | |
plugins/elements/gstfakesrc.c | patch | blob | history |
diff --git a/ChangeLog b/ChangeLog
index 612319dfa980c798a6a7ae1804a01c92d9b9834e..7e3472dbd9e38015bd69d62b19dd91011ea26b0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
2005-11-15 Andy Wingo <wingo@pobox.com>
+ * gst/elements/gstfakesrc.c (gst_fake_src_create): It's not an
+ error if the user selected "no clock" as the clocking method.
+
* check/gst/gstpipeline.c (test_base_time): New test for buffer
timestamps with live capture.
index 350fd0a686ae00c015a7e2810376b2d41b77d5aa..c1a2efc6adbf125e6179701d00df333b47d395be 100644 (file)
GstClock *clock;
clock = gst_element_get_clock (GST_ELEMENT (src));
- g_return_val_if_fail (clock != NULL, GST_FLOW_ERROR);
- time = gst_clock_get_time (clock);
- time -= gst_element_get_base_time (GST_ELEMENT (src));
-
- gst_object_unref (clock);
+ if (clock) {
+ time = gst_clock_get_time (clock);
+ time -= gst_element_get_base_time (GST_ELEMENT (src));
+ gst_object_unref (clock);
+ } else {
+ /* not an error not to have a clock */
+ time = GST_CLOCK_TIME_NONE;
+ }
} else {
time = GST_CLOCK_TIME_NONE;
}
index 350fd0a686ae00c015a7e2810376b2d41b77d5aa..c1a2efc6adbf125e6179701d00df333b47d395be 100644 (file)
GstClock *clock;
clock = gst_element_get_clock (GST_ELEMENT (src));
- g_return_val_if_fail (clock != NULL, GST_FLOW_ERROR);
- time = gst_clock_get_time (clock);
- time -= gst_element_get_base_time (GST_ELEMENT (src));
-
- gst_object_unref (clock);
+ if (clock) {
+ time = gst_clock_get_time (clock);
+ time -= gst_element_get_base_time (GST_ELEMENT (src));
+ gst_object_unref (clock);
+ } else {
+ /* not an error not to have a clock */
+ time = GST_CLOCK_TIME_NONE;
+ }
} else {
time = GST_CLOCK_TIME_NONE;
}