[vlc-devel] [PATCH v3 18/18] video_output: code cleaning

[Steve Lhomme]

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

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index c87a6031808..dcb2fa23463 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1595,7 +1595,7 @@ void vout_NextPicture(vout_thread_t *vout, vlc_tick_t *duration)
     if (sys->step.last == VLC_TICK_INVALID)
         sys->step.last = sys->displayed.timestamp;
 
-    if (ThreadDisplayPicture(sys, NULL) == 0) {
+    if (ThreadDisplayPicture(sys, NULL) == VLC_SUCCESS) {
         sys->step.timestamp = sys->displayed.timestamp;
 
         if (sys->step.last != VLC_TICK_INVALID &&
@@ -1650,7 +1650,8 @@ void vout_ChangeSpuRate(vout_thread_t *vout, size_t channel_id, float rate)
 static void ThreadProcessMouseState(vout_thread_sys_t *p_vout,
                                     const vlc_mouse_t *win_mouse)
 {
-    vlc_mouse_t vid_mouse, tmp1, tmp2, *m;
+    vlc_mouse_t vid_mouse, tmp1, tmp2;
+    const vlc_mouse_t *m;
     vout_thread_t *vout = &p_vout->obj;
     vout_thread_sys_t *sys = p_vout;
 
@@ -1847,8 +1848,6 @@ static void *Thread(void *object)
                 deadline -= vout_chrono_GetHigh(&sys->render) + VOUT_MWAIT_TOLERANCE;
             const vlc_tick_t max_deadline = vlc_tick_now() + VLC_TICK_FROM_MS(100);
             deadline = __MIN(deadline, max_deadline);
-        } else {
-            deadline = INVALID_DEADLINE;
         }
 
         vlc_mutex_lock(&sys->control_lock);
@@ -1862,7 +1861,7 @@ static void *Thread(void *object)
 
             if (sys->mouse_events.i_size <= 0)
             {
-                if (deadline == INVALID_DEADLINE)
+                if (!wait)
                     break;
 
                 picture_t *peek = picture_fifo_Peek(sys->decoder_fifo);
-- 
2.26.2