Commit 1aa633f0 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

video_output: return when the first frame is read in frame by frame mode

It may be possible to start in frame by frame mode. Normally we read the next
frame and replace the current frame with it. But if there was no frame we
should return when the first frame is read, not when the second frame replaced
the first one.
parent ff4daed6
...@@ -1490,7 +1490,7 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline) ...@@ -1490,7 +1490,7 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
assert(!sys->displayed.next); assert(!sys->displayed.next);
sys->displayed.current = sys->displayed.current =
ThreadGetPrerenderedLocked(vout, true, !frame_by_frame, &paused); ThreadGetPrerenderedLocked(vout, true, !frame_by_frame, &paused);
if (!sys->displayed.current) if (!sys->displayed.current || frame_by_frame)
{ {
vlc_mutex_unlock(&sys->filter.lock); vlc_mutex_unlock(&sys->filter.lock);
return VLC_EGENERIC; // wait with no known deadline return VLC_EGENERIC; // wait with no known deadline
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment