[vlc-devel] commit: Always update the wakeup date in input. (Laurent Aimar )

git version control git at videolan.org
Fri Oct 23 23:14:52 CEST 2009


vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Wed Jul 15 18:04:51 2009 +0200| [02a494698c9a2bc7c35dcb03c862562059c024f5] | committer: Laurent Aimar 

Always update the wakeup date in input.
(cherry picked from commit 9e4b3f8d18c66feae1dc433013706505e39f7835)

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

 src/input/input.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index be4eb7b..90e255a 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -816,13 +816,9 @@ static void MainLoop( input_thread_t *p_input )
                 i_statistic_update = i_current + INT64_C(1000000);
             }
 
-            /* Check if i_wakeup is still valid */
+            /* Update the wakeup time */
             if( i_wakeup != 0 )
-            {
-                mtime_t i_new_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
-                if( !i_new_wakeup )
-                    i_wakeup = 0;
-            }
+                i_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
         } while( i_current < i_wakeup );
     }
 




More information about the vlc-devel mailing list