[vlc-commits] vout thread: simplify deadline variables

Rafaël Carré git at videolan.org
Mon Feb 24 17:31:51 CET 2014


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Feb 24 17:30:33 2014 +0100| [acd5cf27ed68463557b94e771a2de61fa0d0b4ba] | committer: Rafaël Carré

vout thread: simplify deadline variables

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

 src/video_output/video_output.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 64bef99..2b1e6b4 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1553,17 +1553,16 @@ static void *Thread(void *object)
         .date = mdate(),
     };
 
-    mtime_t deadline = VLC_TS_INVALID;
     for (;;) {
         vout_control_cmd_t cmd;
         /* FIXME remove thoses ugly timeouts */
-        while (!vout_control_Pop(&sys->control, &cmd, deadline, 100000))
+        while (!vout_control_Pop(&sys->control, &cmd, VLC_TS_INVALID, 100000))
             if (ThreadControl(vout, cmd))
                 return NULL;
 
         vlc_mutex_lock(&sys->picture_lock);
 
-        deadline = VLC_TS_INVALID;
+        mtime_t deadline = VLC_TS_INVALID;
         while (!ThreadDisplayPicture(vout, &deadline))
             ;
 



More information about the vlc-commits mailing list