[vlc-commits] input: remove antilogy

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb 21 16:54:03 2015 +0200| [43464204fc20b39d0413772ab3ffa6787978776c] | committer: Rémi Denis-Courmont

input: remove antilogy

Before the next patch, the deadline should always be zero or positive.
(Also note that deadlines, unlike time-outs are absolute timestamps.)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=43464204fc20b39d0413772ab3ffa6787978776c
---

 src/input/input.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/input.c b/src/input/input.c
index 5913e9d..0ff8f67 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -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;