From ac7b4bfdeb6af11348f15d4a308fcbe61e68b58b Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Sun, 29 Dec 2013 03:52:09 +0100 Subject: ffplay: do not wait for the picture allocation to finish on exit When SDL could not allocate a YUV overlay or open a window, the video thread got locked up because it waited for the allocation to finish forever. Reported-by: Carl Eugen Hoyos Signed-off-by: Marton Balint --- ffplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ffplay.c') diff --git a/ffplay.c b/ffplay.c index fa3e1141d4..164872aaea 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1610,7 +1610,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, double } /* if the queue is aborted, we have to pop the pending ALLOC event or wait for the allocation to complete */ if (is->videoq.abort_request && SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_EVENTMASK(FF_ALLOC_EVENT)) != 1) { - while (!vp->allocated) { + while (!vp->allocated && !is->abort_request) { SDL_CondWait(is->pictq_cond, is->pictq_mutex); } } -- cgit v1.2.3