Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-10-08 14:25:02 +02:00
commit e10666a9d0

View file

@ -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;
} }