]> git.sesse.net Git - vlc/commitdiff
input: remove antilogy
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 21 Feb 2015 14:54:03 +0000 (16:54 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 21 Feb 2015 18:32:21 +0000 (20:32 +0200)
Before the next patch, the deadline should always be zero or positive.
(Also note that deadlines, unlike time-outs are absolute timestamps.)

src/input/input.c

index 5913e9dbf45762e8a565d334991311cf4f30cdda..0ff8f673473ab5b266f170db674df58d609b3957 100644 (file)
@@ -1476,7 +1476,7 @@ static inline int ControlPop( input_thread_t *p_input,
     while( p_sys->i_control <= 0 ||
            ( b_postpone_seek && ControlIsSeekRequest( p_sys->control[0].i_type ) ) )
     {
-        if( !vlc_object_alive( p_input ) || i_deadline < 0 )
+        if( !vlc_object_alive( p_input ) )
         {
             vlc_mutex_unlock( &p_sys->lock_control );
             return VLC_EGENERIC;