summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 2d3e9f6)
raw | patch | inline | side by side (from parent 1: 2d3e9f6)
author | Wim Taymans <wim.taymans@gmail.com> | |
Fri, 30 Sep 2005 08:29:02 +0000 (08:29 +0000) | ||
committer | Wim Taymans <wim.taymans@gmail.com> | |
Fri, 30 Sep 2005 08:29:02 +0000 (08:29 +0000) |
Original commit message from CVS:
* gst/gstelement.c: (gst_element_set_state),
(gst_element_change_state):
Small tweak, element in ASYNC remains ASYNC.
* gst/gstelement.c: (gst_element_set_state),
(gst_element_change_state):
Small tweak, element in ASYNC remains ASYNC.
ChangeLog | patch | blob | history | |
gst/gstelement.c | patch | blob | history |
diff --git a/ChangeLog b/ChangeLog
index b44de284e2096a44084aa8c1cb23330a5a24e019..f98c3a219a4ee4c36bce571f246e12f5ccd62d39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
+2005-09-30 Wim Taymans <wim@fluendo.com>
+
+ * gst/gstelement.c: (gst_element_set_state),
+ (gst_element_change_state):
+ Small tweak, element in ASYNC remains ASYNC.
+
2005-09-30 Wim Taymans <wim@fluendo.com>
* gst/base/gstbasesink.c: (gst_base_sink_change_state):
diff --git a/gst/gstelement.c b/gst/gstelement.c
index 6a368ddfb6d3e3c4c657e640a0308ff73f7216c2..aeeb6eb3d705fbfbcdf4cbada2f36cdc82cdf830 100644 (file)
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
* the STATE_LOCK */
gst_element_commit_state (element);
gst_element_lost_state (element);
+ if (state == GST_STATE_PENDING (element)) {
+ GST_STATE_UNLOCK (element);
+ return GST_STATE_CHANGE_ASYNC;
+ }
}
/* start with the current state */
else
return GST_STATE_CHANGE_SUCCESS;
}
-
}
/**