mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 10:41:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
Conflicts:
	gst/gstbus.c
	gst/gstevent.c
	libs/gst/base/gstbasetransform.c
This commit is contained in:
Tim-Philipp Müller 2011-12-01 23:35:26 +00:00
commit 18291a6b40
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/gstbus.c
View file

@ -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",
message, GST_MESSAGE_TYPE_NAME (message),
GST_MESSAGE_SRC (message) ?
GST_OBJECT_NAME (GST_MESSAGE_SRC (message)) : "NULL", (guint) types);
GST_MESSAGE_SRC_NAME (message), (guint) types);
if ((GST_MESSAGE_TYPE (message) & types) != 0) {
/* exit the loop, we have a message */
goto beach;

3
gst/gstevent.c
View file

@ -654,6 +654,9 @@ gst_event_new_segment (const GstSegment * segment)
GstEvent *event;
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,
segment);