diff options
| author | Josep Torra <n770galaxy@gmail.com> | 2013-03-16 10:13:06 +0100 |
|---|---|---|
| committer | Josep Torra <n770galaxy@gmail.com> | 2013-03-16 15:52:08 +0100 |
| commit | 793798d500010a91cddc992cbf40a9dcaa344b1a (patch) | |
| tree | e6a1fc88c2264684699678722b218c26fdaa1237 | |
| parent | 8e66225ae48744e53a7220bd2c5d2633f1f4aa8f (diff) | |
| download | gst-omx-793798d500010a91cddc992cbf40a9dcaa344b1a.tar.gz | |
omx: minor stylistic change for consistency with other similar code
Conflicts:
omx/gstomx.c
| -rw-r--r-- | omx/gstomx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/omx/gstomx.c b/omx/gstomx.c index 1f48002..8738470 100644 --- a/omx/gstomx.c +++ b/omx/gstomx.c @@ -834,7 +834,6 @@ gst_omx_component_get_state (GstOMXComponent * comp, GstClockTime timeout) timeval = &abstimeout; GST_DEBUG_OBJECT (comp->parent, "%s Waiting for %ld us", comp->name, add); } else { - timeval = NULL; GST_DEBUG_OBJECT (comp->parent, "%s Waiting for signal", comp->name); } @@ -846,7 +845,7 @@ gst_omx_component_get_state (GstOMXComponent * comp, GstClockTime timeout) if (!g_queue_is_empty (&comp->messages)) { signalled = TRUE; } - if (timeval == NULL) { + if (timeout == GST_CLOCK_TIME_NONE) { g_cond_wait (comp->messages_cond, comp->messages_lock); signalled = TRUE; } else { @@ -1526,7 +1525,7 @@ gst_omx_port_set_flushing (GstOMXPort * port, GstClockTime timeout, if (!g_queue_is_empty (&comp->messages)) { signalled = TRUE; } - if (timeout == -1) { + if (timeout == GST_CLOCK_TIME_NONE) { g_cond_wait (comp->messages_cond, comp->messages_lock); signalled = TRUE; } else { |