From eaf4ab9802d5ad82a707514cae165c6db9e7bfc8 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Mon, 10 Nov 2014 23:23:47 +0100 Subject: ffplay: signal the frame queue before closing audio Fixed regression caused by 631ac655c00e978e19d05dab572bc1ffd6078c63 when ffplay does not quit if the audio thread is blocked. Signed-off-by: Marton Balint --- ffplay.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ffplay.c b/ffplay.c index 490bffa8b1..f79161dd00 100644 --- a/ffplay.c +++ b/ffplay.c @@ -2786,9 +2786,8 @@ static void stream_component_close(VideoState *is, int stream_index) switch (avctx->codec_type) { case AVMEDIA_TYPE_AUDIO: packet_queue_abort(&is->audioq); - - SDL_CloseAudio(); frame_queue_signal(&is->sampq); + SDL_CloseAudio(); SDL_WaitThread(is->audio_tid, NULL); decoder_destroy(&is->auddec); -- cgit v1.2.3