mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-20 16:51:10 +00:00
Merge branch 'master' into 0.11
This commit is contained in:
commit
e10666a9d0
1 changed files with 1 additions and 1 deletions
|
@ -419,7 +419,7 @@ gst_pipeline_change_state (GstElement * element, GstStateChange transition)
|
||||||
if (clock) {
|
if (clock) {
|
||||||
now = gst_clock_get_time (clock);
|
now = gst_clock_get_time (clock);
|
||||||
} else {
|
} else {
|
||||||
GST_DEBUG ("no clock, using base time of NONE");
|
GST_DEBUG_OBJECT (pipeline, "no clock, using base time of NONE");
|
||||||
now = GST_CLOCK_TIME_NONE;
|
now = GST_CLOCK_TIME_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue