projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5778ef
)
omx: minor stylistic change for consistency with other similar code
author
Josep Torra
<n770galaxy@gmail.com>
Sat, 16 Mar 2013 09:13:06 +0000
(10:13 +0100)
committer
Josep Torra
<n770galaxy@gmail.com>
Sat, 16 Mar 2013 09:13:06 +0000
(10:13 +0100)
omx/gstomx.c
patch
|
blob
|
history
diff --git
a/omx/gstomx.c
b/omx/gstomx.c
index
701ba6e
..
bfbcea1
100644
(file)
--- a/
omx/gstomx.c
+++ b/
omx/gstomx.c
@@
-840,7
+840,7
@@
gst_omx_component_get_state (GstOMXComponent * comp, GstClockTime timeout)
if (!g_queue_is_empty (&comp->messages)) {
signalled = TRUE;
}
- if (
wait_until == -1
) {
+ if (
timeout == GST_CLOCK_TIME_NONE
) {
g_cond_wait (&comp->messages_cond, &comp->messages_lock);
signalled = TRUE;
} else {
@@
-1520,7
+1520,7
@@
gst_omx_port_set_flushing (GstOMXPort * port, GstClockTime timeout,
if (!g_queue_is_empty (&comp->messages)) {
signalled = TRUE;
}
- if (
wait_until == -1
) {
+ if (
timeout == GST_CLOCK_TIME_NONE
) {
g_cond_wait (&comp->messages_cond, &comp->messages_lock);
signalled = TRUE;
} else {