input: treat negative deadline as no deadline in ControlPop()

diff --git a/src/input/input.c b/src/input/input.c
index 0ff8f673473ab5b266f170db674df58d609b3957..36d3b6d2d0cfd2126cf92c2c53d08a310d4629c9 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1482,12 +1482,17 @@ static inline int ControlPop( input_thread_t *p_input,
             return VLC_EGENERIC;
         }
 
-        if( vlc_cond_timedwait( &p_sys->wait_control, &p_sys->lock_control,
-                                i_deadline ) )
+        if( i_deadline >= 0 )
         {
-            vlc_mutex_unlock( &p_sys->lock_control );
-            return VLC_EGENERIC;
+            if( vlc_cond_timedwait( &p_sys->wait_control, &p_sys->lock_control,
+                                    i_deadline ) )
+            {
+                vlc_mutex_unlock( &p_sys->lock_control );
+                return VLC_EGENERIC;
+            }
         }
+        else
+            vlc_cond_wait( &p_sys->wait_control, &p_sys->lock_control );
     }
 
     /* */