[vlc-commits] video_output: only set the deadline in non-frame by frame mode

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jan 21 14:30:34 2021 +0100| [756950f1f95e85445579a789836b046b2adf222a] | committer: Steve Lhomme

video_output: only set the deadline in non-frame by frame mode

There is no deadline in frame by frame mode.

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

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

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 5e31ad097f..a4a00abe9c 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1471,9 +1471,6 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
     }
     vlc_mutex_unlock(&sys->filter.lock);
 
-    if (deadline)
-        *deadline = VLC_TICK_INVALID;
-
     bool render_now;
     if (frame_by_frame)
     {
@@ -1519,7 +1516,10 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
             next =
                 ThreadDisplayPreparePicture(vout, true, false, &paused);
             if (!next)
+            {
+                *deadline = VLC_TICK_INVALID;
                 return VLC_EGENERIC; // wait with no known deadline
+            }
         }
         else if (!paused)
         {