summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2014-11-10 23:23:47 +0100
committerMarton Balint <cus@passwd.hu>2014-11-11 23:02:00 +0100
commiteaf4ab9802d5ad82a707514cae165c6db9e7bfc8 (patch)
tree06ccfa8b52f6b671e281e43d8808a77ad6e8f4d8 /ffplay.c
parent2813dabdd4964ab37f8b0cea42f49531931c9006 (diff)
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 <cus@passwd.hu>
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c3
1 files changed, 1 insertions, 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);