Commit 18291a6b authored by Tim-Philipp Müller's avatar Tim-Philipp Müller

Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
	gst/gstbus.c
	gst/gstevent.c
	libs/gst/base/gstbasetransform.c
parents f95e77af e34d796e
...@@ -484,9 +484,7 @@ gst_bus_timed_pop_filtered (GstBus * bus, GstClockTime timeout, ...@@ -484,9 +484,7 @@ gst_bus_timed_pop_filtered (GstBus * bus, GstClockTime timeout,
GST_DEBUG_OBJECT (bus, "got message %p, %s from %s, type mask is %u", GST_DEBUG_OBJECT (bus, "got message %p, %s from %s, type mask is %u",
message, GST_MESSAGE_TYPE_NAME (message), message, GST_MESSAGE_TYPE_NAME (message),
GST_MESSAGE_SRC (message) ? GST_MESSAGE_SRC_NAME (message), (guint) types);
GST_OBJECT_NAME (GST_MESSAGE_SRC (message)) : "NULL", (guint) types);
if ((GST_MESSAGE_TYPE (message) & types) != 0) { if ((GST_MESSAGE_TYPE (message) & types) != 0) {
/* exit the loop, we have a message */ /* exit the loop, we have a message */
goto beach; goto beach;
......
...@@ -654,6 +654,9 @@ gst_event_new_segment (const GstSegment * segment) ...@@ -654,6 +654,9 @@ gst_event_new_segment (const GstSegment * segment)
GstEvent *event; GstEvent *event;
g_return_val_if_fail (segment != NULL, NULL); g_return_val_if_fail (segment != NULL, NULL);
g_return_val_if_fail (segment->rate != 0.0, NULL);
g_return_val_if_fail (segment->applied_rate != 0.0, NULL);
g_return_val_if_fail (segment->format != GST_FORMAT_UNDEFINED, NULL);
GST_CAT_INFO (GST_CAT_EVENT, "creating segment event %" GST_SEGMENT_FORMAT, GST_CAT_INFO (GST_CAT_EVENT, "creating segment event %" GST_SEGMENT_FORMAT,
segment); segment);
......
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